Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2024-12-29 09:12:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

libnvdimm: Make remove callback return void

Browse Source 
All drivers return 0 in their remove callback and the driver core ignores
the return value of nvdimm_bus_remove() anyhow. So simplify by changing
the driver remove callback to return void and return 0 unconditionally
to the upper layer.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Link: https://lore.kernel.org/r/20210212171043.2136580-2-u.kleine-koenig@pengutronix.de
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
This commit is contained in:
Uwe Kleine-König 2021-02-12 18:10:43 +01:00 committed by Dan Williams
parent 8409f942a1
commit 1f97507463
7 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/dax/pmem/compat.c
View File

@ -41,10 +41,9 @@ static int dax_pmem_compat_release(struct device *dev, void *data)
return 0; return 0;
} }
static int dax_pmem_compat_remove(struct device *dev) static void dax_pmem_compat_remove(struct device *dev)
{ {
device_for_each_child(dev, NULL, dax_pmem_compat_release); device_for_each_child(dev, NULL, dax_pmem_compat_release);
return 0;
} }
static struct nd_device_driver dax_pmem_compat_driver = { static struct nd_device_driver dax_pmem_compat_driver = {

3
drivers/nvdimm/blk.c
View File

@ -310,11 +310,10 @@ static int nd_blk_probe(struct device *dev)
return nsblk_attach_disk(nsblk); return nsblk_attach_disk(nsblk);
} }
static int nd_blk_remove(struct device *dev) static void nd_blk_remove(struct device *dev)
{ {
if (is_nd_btt(dev)) if (is_nd_btt(dev))
nvdimm_namespace_detach_btt(to_nd_btt(dev)); nvdimm_namespace_detach_btt(to_nd_btt(dev));
return 0;
} }
static struct nd_device_driver nd_blk_driver = { static struct nd_device_driver nd_blk_driver = {

13
drivers/nvdimm/bus.c
View File

@ -113,18 +113,17 @@ static int nvdimm_bus_remove(struct device *dev)
struct nd_device_driver *nd_drv = to_nd_device_driver(dev->driver); struct nd_device_driver *nd_drv = to_nd_device_driver(dev->driver);
struct module *provider = to_bus_provider(dev); struct module *provider = to_bus_provider(dev);
struct nvdimm_bus *nvdimm_bus = walk_to_nvdimm_bus(dev); struct nvdimm_bus *nvdimm_bus = walk_to_nvdimm_bus(dev);
int rc = 0;
if (nd_drv->remove) { if (nd_drv->remove) {
debug_nvdimm_lock(dev); debug_nvdimm_lock(dev);
rc = nd_drv->remove(dev); nd_drv->remove(dev);
debug_nvdimm_unlock(dev); debug_nvdimm_unlock(dev);
} }
dev_dbg(&nvdimm_bus->dev, "%s.remove(%s) = %d\n", dev->driver->name, dev_dbg(&nvdimm_bus->dev, "%s.remove(%s)\n", dev->driver->name,
dev_name(dev), rc); dev_name(dev));
module_put(provider); module_put(provider);
return rc; return 0;
} }
static void nvdimm_bus_shutdown(struct device *dev) static void nvdimm_bus_shutdown(struct device *dev)
@ -427,7 +426,7 @@ static void free_badrange_list(struct list_head *badrange_list)
list_del_init(badrange_list); list_del_init(badrange_list);
} }
static int nd_bus_remove(struct device *dev) static void nd_bus_remove(struct device *dev)
{ {
struct nvdimm_bus *nvdimm_bus = to_nvdimm_bus(dev); struct nvdimm_bus *nvdimm_bus = to_nvdimm_bus(dev);
@ -446,8 +445,6 @@ static int nd_bus_remove(struct device *dev)
spin_unlock(&nvdimm_bus->badrange.lock); spin_unlock(&nvdimm_bus->badrange.lock);
nvdimm_bus_destroy_ndctl(nvdimm_bus); nvdimm_bus_destroy_ndctl(nvdimm_bus);
return 0;
} }
static int nd_bus_probe(struct device *dev) static int nd_bus_probe(struct device *dev)

4
drivers/nvdimm/dimm.c
View File

@ -113,7 +113,7 @@ static int nvdimm_probe(struct device *dev)
return rc; return rc;
} }
static int nvdimm_remove(struct device *dev) static void nvdimm_remove(struct device *dev)
{ {
struct nvdimm_drvdata *ndd = dev_get_drvdata(dev); struct nvdimm_drvdata *ndd = dev_get_drvdata(dev);
@ -121,8 +121,6 @@ static int nvdimm_remove(struct device *dev)
dev_set_drvdata(dev, NULL); dev_set_drvdata(dev, NULL);
nvdimm_bus_unlock(dev); nvdimm_bus_unlock(dev);
put_ndd(ndd); put_ndd(ndd);
return 0;
} }
static struct nd_device_driver nvdimm_driver = { static struct nd_device_driver nvdimm_driver = {

4
drivers/nvdimm/pmem.c
View File

@ -564,7 +564,7 @@ static int nd_pmem_probe(struct device *dev)
return pmem_attach_disk(dev, ndns); return pmem_attach_disk(dev, ndns);
} }
static int nd_pmem_remove(struct device *dev) static void nd_pmem_remove(struct device *dev)
{ {
struct pmem_device *pmem = dev_get_drvdata(dev); struct pmem_device *pmem = dev_get_drvdata(dev);
@ -579,8 +579,6 @@ static int nd_pmem_remove(struct device *dev)
pmem->bb_state = NULL; pmem->bb_state = NULL;
} }
nvdimm_flush(to_nd_region(dev->parent), NULL); nvdimm_flush(to_nd_region(dev->parent), NULL);
return 0;
} }
static void nd_pmem_shutdown(struct device *dev) static void nd_pmem_shutdown(struct device *dev)

4
drivers/nvdimm/region.c
View File

@ -87,7 +87,7 @@ static int child_unregister(struct device *dev, void *data)
return 0; return 0;
} }
static int nd_region_remove(struct device *dev) static void nd_region_remove(struct device *dev)
{ {
struct nd_region *nd_region = to_nd_region(dev); struct nd_region *nd_region = to_nd_region(dev);
@ -108,8 +108,6 @@ static int nd_region_remove(struct device *dev)
*/ */
sysfs_put(nd_region->bb_state); sysfs_put(nd_region->bb_state);
nd_region->bb_state = NULL; nd_region->bb_state = NULL;
return 0;
} }
static int child_notify(struct device *dev, void *data) static int child_notify(struct device *dev, void *data)

2
include/linux/nd.h
View File

@ -26,7 +26,7 @@ struct nd_device_driver {
struct device_driver drv; struct device_driver drv;
unsigned long type; unsigned long type;
int (*probe)(struct device *dev); int (*probe)(struct device *dev);
int (*remove)(struct device *dev); void (*remove)(struct device *dev);
void (*shutdown)(struct device *dev); void (*shutdown)(struct device *dev);
void (*notify)(struct device *dev, enum nvdimm_event event); void (*notify)(struct device *dev, enum nvdimm_event event);
}; };