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

diff --git a/drivers/mtd/nand/raw/brcmnand/bcm63138_nand.c b/drivers/mtd/nand/raw/brcmnand/bcm63138_nand.c
index 9596629000f41b02e6c2fa7ae49d831822de5d7c..968c5b674b089b33aad01173651e9ea8e6bff959 100644 (file)
--- a/drivers/mtd/nand/raw/brcmnand/bcm63138_nand.c
+++ b/drivers/mtd/nand/raw/brcmnand/bcm63138_nand.c
@@ -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,

diff --git a/drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c b/drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c
index a06cd87f839a60251e9b3a9522ee94cc1b8d7973..05b7b653bdf30f77b15cc28c31138f14b12f2828 100644 (file)
--- a/drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c
+++ b/drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c
@@ -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,

diff --git a/drivers/mtd/nand/raw/brcmnand/bcma_nand.c b/drivers/mtd/nand/raw/brcmnand/bcma_nand.c
index dd27977919fbac8f0886d563836e9a00440cd095..4e7e435ba339652da43a5c0381422b85406ecc97 100644 (file)
--- a/drivers/mtd/nand/raw/brcmnand/bcma_nand.c
+++ b/drivers/mtd/nand/raw/brcmnand/bcma_nand.c
@@ -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,

diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.c b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
index 440bef477930c2aa9a0a252f0293a9cc76b31dcb..30fc399f346e299293d476ac20d82c0a0be2a68a 100644 (file)
--- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c
+++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
@@ -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);
 

diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.h b/drivers/mtd/nand/raw/brcmnand/brcmnand.h
index f1f93d85f50d27f93efb35d4a85eaba9501d8ad4..928114c0be5ef0c16b4822ee9bb8cabff004dbca 100644 (file)
--- a/drivers/mtd/nand/raw/brcmnand/brcmnand.h
+++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.h
@@ -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;
 

diff --git a/drivers/mtd/nand/raw/brcmnand/brcmstb_nand.c b/drivers/mtd/nand/raw/brcmnand/brcmstb_nand.c
index 950923d977b7271c8ecca9e387692471c867337f..558f083b92e9bfc870a545b096500051bcef628b 100644 (file)
--- a/drivers/mtd/nand/raw/brcmnand/brcmstb_nand.c
+++ b/drivers/mtd/nand/raw/brcmnand/brcmstb_nand.c
@@ -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,

diff --git a/drivers/mtd/nand/raw/brcmnand/iproc_nand.c b/drivers/mtd/nand/raw/brcmnand/iproc_nand.c
index 089c70fc6edfc06393d90d39653412ba1e3c4dc4..bf46c8b858986f65fb5482698384e247618d8b83 100644 (file)
--- a/drivers/mtd/nand/raw/brcmnand/iproc_nand.c
+++ b/drivers/mtd/nand/raw/brcmnand/iproc_nand.c
@@ -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,