Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-10 22:21:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

ndtest: Cleanup all of blk namespace specific code

Browse Source 
With the nd_namespace_blk and nd_blk_region infrastructures being removed,
the ndtest still has some references to the old code. So the
compilation fails as below,

../tools/testing/nvdimm/test/ndtest.c:204:25: error: ‘ND_DEVICE_NAMESPACE_BLK’ undeclared here (not in a function); did you mean ‘ND_DEVICE_NAMESPACE_IO’?
  204 |                 .type = ND_DEVICE_NAMESPACE_BLK,
      |                         ^~~~~~~~~~~~~~~~~~~~~~~
      |                         ND_DEVICE_NAMESPACE_IO
../tools/testing/nvdimm/test/ndtest.c: In function ‘ndtest_create_region’:
../tools/testing/nvdimm/test/ndtest.c:630:17: error: ‘ndbr_desc’ undeclared (first use in this function); did you mean ‘ndr_desc’?
  630 |                 ndbr_desc.enable = ndtest_blk_region_enable;
      |                 ^~~~~~~~~
      |                 ndr_desc
../tools/testing/nvdimm/test/ndtest.c:630:17: note: each undeclared identifier is reported only once for each function it appears in
../tools/testing/nvdimm/test/ndtest.c:630:36: error: ‘ndtest_blk_region_enable’ undeclared (first use in this function)
  630 |                 ndbr_desc.enable = ndtest_blk_region_enable;
      |                                    ^~~~~~~~~~~~~~~~~~~~~~~~
../tools/testing/nvdimm/test/ndtest.c:631:35: error: ‘ndtest_blk_do_io’ undeclared (first use in this function); did you mean ‘ndtest_blk_mmio’?
  631 |                 ndbr_desc.do_io = ndtest_blk_do_io;
      |                                   ^~~~~~~~~~~~~~~~
      |                                   ndtest_blk_mmio

The current patch removes the specific code to cleanup all obsolete
references.

Signed-off-by: Shivaprasad G Bhat <sbhat@linux.ibm.com>
Link: https://lore.kernel.org/r/165763940218.3501174.7103619358744815702.stgit@ltc-boston123.aus.stglabs.ibm.com
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
This commit is contained in:
Shivaprasad G Bhat 2022-07-12 10:23:44 -05:00 committed by Dan Williams
parent 149d17140b
commit 69053101e0
1 changed files with 0 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
tools/testing/nvdimm/test/ndtest.c
View File

@ -134,39 +134,6 @@ static struct ndtest_mapping region1_mapping[] = {
},
};
static struct ndtest_mapping region2_mapping[] = {
{
.dimm = 0,
.position = 0,
.start = 0,
.size = DIMM_SIZE,
},
};
static struct ndtest_mapping region3_mapping[] = {
{
.dimm = 1,
.start = 0,
.size = DIMM_SIZE,
}
};
static struct ndtest_mapping region4_mapping[] = {
{
.dimm = 2,
.start = 0,
.size = DIMM_SIZE,
}
};
static struct ndtest_mapping region5_mapping[] = {
{
.dimm = 3,
.start = 0,
.size = DIMM_SIZE,
}
};
static struct ndtest_region bus0_regions[] = {
{
.type = ND_DEVICE_NAMESPACE_PMEM,
@ -182,34 +149,6 @@ static struct ndtest_region bus0_regions[] = {
.size = DIMM_SIZE * 2,
.range_index = 2,
},
{
.type = ND_DEVICE_NAMESPACE_BLK,
.num_mappings = ARRAY_SIZE(region2_mapping),
.mapping = region2_mapping,
.size = DIMM_SIZE,
.range_index = 3,
},
{
.type = ND_DEVICE_NAMESPACE_BLK,
.num_mappings = ARRAY_SIZE(region3_mapping),
.mapping = region3_mapping,
.size = DIMM_SIZE,
.range_index = 4,
},
{
.type = ND_DEVICE_NAMESPACE_BLK,
.num_mappings = ARRAY_SIZE(region4_mapping),
.mapping = region4_mapping,
.size = DIMM_SIZE,
.range_index = 5,
},
{
.type = ND_DEVICE_NAMESPACE_BLK,
.num_mappings = ARRAY_SIZE(region5_mapping),
.mapping = region5_mapping,
.size = DIMM_SIZE,
.range_index = 6,
},
};
static struct ndtest_mapping region6_mapping[] = {
@ -501,21 +440,6 @@ static int ndtest_create_region(struct ndtest_priv *p,
nd_set->altcookie = nd_set->cookie1;
ndr_desc->nd_set = nd_set;
if (region->type == ND_DEVICE_NAMESPACE_BLK) {
mappings[0].start = 0;
mappings[0].size = DIMM_SIZE;
mappings[0].nvdimm = p->config->dimms[ndimm].nvdimm;
ndr_desc->mapping = &mappings[0];
ndr_desc->num_mappings = 1;
ndr_desc->num_lanes = 1;
ndbr_desc.enable = ndtest_blk_region_enable;
ndbr_desc.do_io = ndtest_blk_do_io;
region->region = nvdimm_blk_region_create(p->bus, ndr_desc);
goto done;
}
for (i = 0; i < region->num_mappings; i++) {
ndimm = region->mapping[i].dimm;
mappings[i].start = region->mapping[i].start;
@ -527,7 +451,6 @@ static int ndtest_create_region(struct ndtest_priv *p,
ndr_desc->num_mappings = region->num_mappings;
region->region = nvdimm_pmem_region_create(p->bus, ndr_desc);
done:
if (!region->region) {
dev_err(&p->pdev.dev, "Error registering region %pR\n",
ndr_desc->res);