Commit 878a8e1e authored by Dr. David Alan Gilbert's avatar Dr. David Alan Gilbert Committed by Ira Weiny
Browse files

libnvdimm: Remove unused nd_region_conflict 



nd_region_conflict() has been unused since 2019's
commit a3619190 ("libnvdimm/pfn: stop padding pmem namespaces to
section alignment")

Remove it, and the region_confict() helper it uses, and the associated
struct conflict_context.

Signed-off-by: default avatarDr. David Alan Gilbert <linux@treblig.org>
Reviewed-by: default avatarIra Weiny <ira.weiny@intel.com>
Link: https://patch.msgid.link/20250220004538.84585-2-linux@treblig.org


Signed-off-by: default avatarIra Weiny <ira.weiny@intel.com>
parent 2ff0e408

drivers/nvdimm/nd-core.h

+0 −2
Original line number Diff line number Diff line
@@ -127,8 +127,6 @@ resource_size_t nd_region_allocatable_dpa(struct nd_region *nd_region); 
resource_size_t nd_pmem_available_dpa(struct nd_region *nd_region,

				      struct nd_mapping *nd_mapping);

resource_size_t nd_region_available_dpa(struct nd_region *nd_region);

int nd_region_conflict(struct nd_region *nd_region, resource_size_t start,

		resource_size_t size);

resource_size_t nvdimm_allocated_dpa(struct nvdimm_drvdata *ndd,

		struct nd_label_id *label_id);

int nvdimm_num_label_slots(struct nvdimm_drvdata *ndd);

drivers/nvdimm/region_devs.c

+0 −41
Original line number Diff line number Diff line
@@ -1229,45 +1229,4 @@ bool is_nvdimm_sync(struct nd_region *nd_region) 
}

EXPORT_SYMBOL_GPL(is_nvdimm_sync);



struct conflict_context {

	struct nd_region *nd_region;

	resource_size_t start, size;

};



static int region_conflict(struct device *dev, void *data)

{

	struct nd_region *nd_region;

	struct conflict_context *ctx = data;

	resource_size_t res_end, region_end, region_start;



	if (!is_memory(dev))

		return 0;



	nd_region = to_nd_region(dev);

	if (nd_region == ctx->nd_region)

		return 0;



	res_end = ctx->start + ctx->size;

	region_start = nd_region->ndr_start;

	region_end = region_start + nd_region->ndr_size;

	if (ctx->start >= region_start && ctx->start < region_end)

		return -EBUSY;

	if (res_end > region_start && res_end <= region_end)

		return -EBUSY;

	return 0;

}



int nd_region_conflict(struct nd_region *nd_region, resource_size_t start,

		resource_size_t size)

{

	struct nvdimm_bus *nvdimm_bus = walk_to_nvdimm_bus(&nd_region->dev);

	struct conflict_context ctx = {

		.nd_region = nd_region,

		.start = start,

		.size = size,

	};



	return device_for_each_child(&nvdimm_bus->dev, &ctx, region_conflict);

}



MODULE_IMPORT_NS("DEVMEM");