mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2024-11-22 04:38:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

platform: Make platform_driver::remove() return void

Browse Source 
struct platform_driver::remove returning an integer made driver authors
expect that returning an error code was proper error handling. However
the driver core ignores the error and continues to remove the device
because there is nothing the core could do anyhow and reentering the
remove callback again is only calling for trouble.

To prevent such wrong assumptions, change the return type of the remove
callback to void. This was prepared by introducing an alternative remove
callback returning void and converting all drivers to that. So .remove()
can be changed without further changes in drivers.

This corresponds to step b) of the plan outlined in commit
5c5a7680e6 ("platform: Provide a remove callback that returns no value").

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
This commit is contained in:
Uwe Kleine-König 2023-10-09 12:37:26 +02:00
parent 45e7d78ef5
commit 0edb555a65
2 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/base/platform.c
View File

@ -1420,14 +1420,8 @@ static void platform_remove(struct device *_dev)
struct platform_driver *drv = to_platform_driver(_dev->driver); struct platform_driver *drv = to_platform_driver(_dev->driver);
struct platform_device *dev = to_platform_device(_dev); struct platform_device *dev = to_platform_device(_dev);
if (drv->remove_new) { if (drv->remove)
drv->remove_new(dev); drv->remove(dev);
} else if (drv->remove) {
int ret = drv->remove(dev);
if (ret)
dev_warn(_dev, "remove callback returned a non-zero value. This will be ignored.\n");
}
dev_pm_domain_detach(_dev, true); dev_pm_domain_detach(_dev, true);
} }

13
include/linux/platform_device.h
View File

@ -237,15 +237,14 @@ struct platform_driver {
int (*probe)(struct platform_device *); int (*probe)(struct platform_device *);
/* /*
* Traditionally the remove callback returned an int which however is * .remove_new() is a relic from a prototype conversion of .remove().
* ignored by the driver core. This led to wrong expectations by driver * New drivers are supposed to implement .remove(). Once all drivers are
* authors who thought returning an error code was a valid error * converted to not use .remove_new any more, it will be dropped.
* handling strategy. To convert to a callback returning void, new
* drivers should implement .remove_new() until the conversion it done
* that eventually makes .remove() return void.
*/ */
int (*remove)(struct platform_device *); union {
void (*remove)(struct platform_device *);
void (*remove_new)(struct platform_device *); void (*remove_new)(struct platform_device *);
};
void (*shutdown)(struct platform_device *); void (*shutdown)(struct platform_device *);
int (*suspend)(struct platform_device *, pm_message_t state); int (*suspend)(struct platform_device *, pm_message_t state);