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

Commit 6cf9c5ba authored by Dan Williams's avatar Dan Williams
Browse files

libnvdimm: stop requiring a driver ->remove() method 



The dax_pmem driver was implementing an empty ->remove() method to
satisfy the nvdimm bus driver that unconditionally calls ->remove().
Teach the core bus driver to check if ->remove() is NULL to remove that
requirement.

Reported-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent 45a0dac0

drivers/nvdimm/bus.c

+5 −4
Original line number Diff line number Diff line
@@ -124,8 +124,9 @@ static int nvdimm_bus_remove(struct device *dev) 
	struct nd_device_driver *nd_drv = to_nd_device_driver(dev->driver);

	struct module *provider = to_bus_provider(dev);

	struct nvdimm_bus *nvdimm_bus = walk_to_nvdimm_bus(dev);

	int rc;

	int rc = 0;



	if (nd_drv->remove)

		rc = nd_drv->remove(dev);

	nd_region_disable(nvdimm_bus, dev);
@@ -296,8 +297,8 @@ int __nd_driver_register(struct nd_device_driver *nd_drv, struct module *owner, 
		return -EINVAL;

	}



	if (!nd_drv->probe || !nd_drv->remove) {

		pr_debug("->probe() and ->remove() must be specified\n");

	if (!nd_drv->probe) {

		pr_debug("%s ->probe() must be specified\n", mod_name);

		return -EINVAL;

	}