Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc9775d8 authored by Dan Williams's avatar Dan Williams
Browse files

libnvdimm: move ->module to struct nvdimm_bus_descriptor 



Let the provider module be explicitly passed in rather than implicitly
assumed by the module that calls nvdimm_bus_register().  This is in
preparation for unifying the nfit and nfit_test driver teardown paths.

Reviewed-by: default avatarLee, Chun-Yi <jlee@suse.com>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent e7a11b44

drivers/acpi/nfit.c

+1 −0
Original line number Diff line number Diff line
@@ -2417,6 +2417,7 @@ void acpi_nfit_desc_init(struct acpi_nfit_desc *acpi_desc, struct device *dev) 
	acpi_desc->blk_do_io = acpi_nfit_blk_region_do_io;

	nd_desc = &acpi_desc->nd_desc;

	nd_desc->provider_name = "ACPI.NFIT";

	nd_desc->module = THIS_MODULE;

	nd_desc->ndctl = acpi_nfit_ctl;

	nd_desc->flush_probe = acpi_nfit_flush_probe;

	nd_desc->clear_to_send = acpi_nfit_clear_to_send;

drivers/nvdimm/bus.c

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ static struct module *to_bus_provider(struct device *dev) 
	if (is_nd_pmem(dev) || is_nd_blk(dev)) {

		struct nvdimm_bus *nvdimm_bus = walk_to_nvdimm_bus(dev);



		return nvdimm_bus->module;

		return nvdimm_bus->nd_desc->module;

	}

	return NULL;

}

drivers/nvdimm/core.c

+3 −4
Original line number Diff line number Diff line
@@ -447,8 +447,8 @@ struct attribute_group nvdimm_bus_attribute_group = { 
};

EXPORT_SYMBOL_GPL(nvdimm_bus_attribute_group);



struct nvdimm_bus *__nvdimm_bus_register(struct device *parent,

		struct nvdimm_bus_descriptor *nd_desc, struct module *module)

struct nvdimm_bus *nvdimm_bus_register(struct device *parent,

		struct nvdimm_bus_descriptor *nd_desc)

{

	struct nvdimm_bus *nvdimm_bus;

	int rc;
@@ -467,7 +467,6 @@ struct nvdimm_bus *__nvdimm_bus_register(struct device *parent, 
		return NULL;

	}

	nvdimm_bus->nd_desc = nd_desc;

	nvdimm_bus->module = module;

	nvdimm_bus->dev.parent = parent;

	nvdimm_bus->dev.release = nvdimm_bus_release;

	nvdimm_bus->dev.groups = nd_desc->attr_groups;
@@ -491,7 +490,7 @@ struct nvdimm_bus *__nvdimm_bus_register(struct device *parent, 
	put_device(&nvdimm_bus->dev);

	return NULL;

}

EXPORT_SYMBOL_GPL(__nvdimm_bus_register);

EXPORT_SYMBOL_GPL(nvdimm_bus_register);



static void set_badblock(struct badblocks *bb, sector_t s, int num)

{

drivers/nvdimm/e820.c

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ static int e820_pmem_probe(struct platform_device *pdev) 


	nd_desc.attr_groups = e820_pmem_attribute_groups;

	nd_desc.provider_name = "e820";

	nd_desc.module = THIS_MODULE;

	nvdimm_bus = nvdimm_bus_register(dev, &nd_desc);

	if (!nvdimm_bus)

		goto err;

drivers/nvdimm/nd-core.h

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ extern int nvdimm_major; 
struct nvdimm_bus {

	struct nvdimm_bus_descriptor *nd_desc;

	wait_queue_head_t probe_wait;

	struct module *module;

	struct list_head list;

	struct device dev;

	int id, probe_active;