libnvdimm: stop requiring a driver ->remove() method (6cf9c5ba) · Commits · 戴 / test

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:

Johannes Thumshirn <jthumshirn@suse.de> Reviewed-by:

Johannes Thumshirn <jthumshirn@suse.de> Signed-off-by:

Dan Williams <dan.j.williams@intel.com>

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;
		}

Admin message