mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2025-01-22 13:54:57 +08:00
mtd: rawnand: brcmnand: Convert to platform remove callback returning void
The .remove() callback for a platform driver returns an int which makes many driver authors wrongly assume it's possible to do error handling by returning an error code. However the value returned is ignored (apart from emitting a warning) and this typically results in resource leaks. To improve here there is a quest to make the remove callback return void. In the first step of this quest all drivers are converted to .remove_new(), which already returns void. Eventually after all drivers are converted, .remove_new() will be renamed to .remove(). By changing the function brcmnand_remove() to return void several drivers that use this function as remove callback can be converted to .remove_new(). Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com> Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> Link: https://lore.kernel.org/linux-mtd/20231102220246.3336154-7-u.kleine-koenig@pengutronix.de
This commit is contained in:
parent
b85ea95d08
commit
215283a1a4
@ -85,7 +85,7 @@ MODULE_DEVICE_TABLE(of, bcm63138_nand_of_match);
|
||||
|
||||
static struct platform_driver bcm63138_nand_driver = {
|
||||
.probe = bcm63138_nand_probe,
|
||||
.remove = brcmnand_remove,
|
||||
.remove_new = brcmnand_remove,
|
||||
.driver = {
|
||||
.name = "bcm63138_nand",
|
||||
.pm = &brcmnand_pm_ops,
|
||||
|
@ -117,7 +117,7 @@ MODULE_DEVICE_TABLE(of, bcm6368_nand_of_match);
|
||||
|
||||
static struct platform_driver bcm6368_nand_driver = {
|
||||
.probe = bcm6368_nand_probe,
|
||||
.remove = brcmnand_remove,
|
||||
.remove_new = brcmnand_remove,
|
||||
.driver = {
|
||||
.name = "bcm6368_nand",
|
||||
.pm = &brcmnand_pm_ops,
|
||||
|
@ -119,7 +119,7 @@ static int brcmnand_bcma_nand_probe(struct platform_device *pdev)
|
||||
|
||||
static struct platform_driver brcmnand_bcma_nand_driver = {
|
||||
.probe = brcmnand_bcma_nand_probe,
|
||||
.remove = brcmnand_remove,
|
||||
.remove_new = brcmnand_remove,
|
||||
.driver = {
|
||||
.name = "bcma_brcmnand",
|
||||
.pm = &brcmnand_pm_ops,
|
||||
|
@ -3299,7 +3299,7 @@ err:
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(brcmnand_probe);
|
||||
|
||||
int brcmnand_remove(struct platform_device *pdev)
|
||||
void brcmnand_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct brcmnand_controller *ctrl = dev_get_drvdata(&pdev->dev);
|
||||
struct brcmnand_host *host;
|
||||
@ -3316,8 +3316,6 @@ int brcmnand_remove(struct platform_device *pdev)
|
||||
clk_disable_unprepare(ctrl->clk);
|
||||
|
||||
dev_set_drvdata(&pdev->dev, NULL);
|
||||
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(brcmnand_remove);
|
||||
|
||||
|
@ -88,7 +88,7 @@ static inline void brcmnand_soc_write(struct brcmnand_soc *soc, u32 val,
|
||||
}
|
||||
|
||||
int brcmnand_probe(struct platform_device *pdev, struct brcmnand_soc *soc);
|
||||
int brcmnand_remove(struct platform_device *pdev);
|
||||
void brcmnand_remove(struct platform_device *pdev);
|
||||
|
||||
extern const struct dev_pm_ops brcmnand_pm_ops;
|
||||
|
||||
|
@ -23,7 +23,7 @@ static int brcmstb_nand_probe(struct platform_device *pdev)
|
||||
|
||||
static struct platform_driver brcmstb_nand_driver = {
|
||||
.probe = brcmstb_nand_probe,
|
||||
.remove = brcmnand_remove,
|
||||
.remove_new = brcmnand_remove,
|
||||
.driver = {
|
||||
.name = "brcmstb_nand",
|
||||
.pm = &brcmnand_pm_ops,
|
||||
|
@ -134,7 +134,7 @@ MODULE_DEVICE_TABLE(of, iproc_nand_of_match);
|
||||
|
||||
static struct platform_driver iproc_nand_driver = {
|
||||
.probe = iproc_nand_probe,
|
||||
.remove = brcmnand_remove,
|
||||
.remove_new = brcmnand_remove,
|
||||
.driver = {
|
||||
.name = "iproc_nand",
|
||||
.pm = &brcmnand_pm_ops,
|
||||
|
Loading…
Reference in New Issue
Block a user