* [PATCH 1/4] mtd: rawnand: brcmnand: Convert to platform remove callback returning void
2023-11-02 22:02 [PATCH 0/4] mtd: Convert to platform remove callback returning (part II) Uwe Kleine-König
@ 2023-11-02 22:02 ` Uwe Kleine-König
2023-11-02 22:13 ` Florian Fainelli
2023-11-13 11:12 ` Miquel Raynal
2023-11-03 8:11 ` [PATCH 0/4] mtd: Convert to platform remove callback returning (part II) Miquel Raynal
1 sibling, 2 replies; 5+ messages in thread
From: Uwe Kleine-König @ 2023-11-02 22:02 UTC (permalink / raw)
To: Miquel Raynal, Vignesh Raghavendra
Cc: Brian Norris, Kamal Dasu, Broadcom internal kernel review list,
Richard Weinberger, William Zhang, Anand Gore, Kursad Oney,
Florian Fainelli, Rafał Miłecki, Ray Jui, Scott Branden,
linux-mtd, linux-arm-kernel, kernel
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>
---
drivers/mtd/nand/raw/brcmnand/bcm63138_nand.c | 2 +-
drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c | 2 +-
drivers/mtd/nand/raw/brcmnand/bcma_nand.c | 2 +-
drivers/mtd/nand/raw/brcmnand/brcmnand.c | 4 +---
drivers/mtd/nand/raw/brcmnand/brcmnand.h | 2 +-
drivers/mtd/nand/raw/brcmnand/brcmstb_nand.c | 2 +-
drivers/mtd/nand/raw/brcmnand/iproc_nand.c | 2 +-
7 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/drivers/mtd/nand/raw/brcmnand/bcm63138_nand.c b/drivers/mtd/nand/raw/brcmnand/bcm63138_nand.c
index 9596629000f4..968c5b674b08 100644
--- 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 a06cd87f839a..05b7b653bdf3 100644
--- 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 dd27977919fb..4e7e435ba339 100644
--- 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 440bef477930..30fc399f346e 100644
--- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c
+++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
@@ -3299,7 +3299,7 @@ int brcmnand_probe(struct platform_device *pdev, struct brcmnand_soc *soc)
}
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 f1f93d85f50d..928114c0be5e 100644
--- 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 950923d977b7..558f083b92e9 100644
--- 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 089c70fc6edf..bf46c8b85898 100644
--- 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,
--
2.42.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH 0/4] mtd: Convert to platform remove callback returning (part II)
2023-11-02 22:02 [PATCH 0/4] mtd: Convert to platform remove callback returning (part II) Uwe Kleine-König
2023-11-02 22:02 ` [PATCH 1/4] mtd: rawnand: brcmnand: Convert to platform remove callback returning void Uwe Kleine-König
@ 2023-11-03 8:11 ` Miquel Raynal
1 sibling, 0 replies; 5+ messages in thread
From: Miquel Raynal @ 2023-11-03 8:11 UTC (permalink / raw)
To: Uwe Kleine-König
Cc: Vignesh Raghavendra, Brian Norris, Kamal Dasu,
Broadcom internal kernel review list, Richard Weinberger,
William Zhang, Anand Gore, Kursad Oney, Florian Fainelli,
Rafał Miłecki, Ray Jui, Scott Branden, linux-mtd,
linux-arm-kernel, kernel
Hi Uwe,
u.kleine-koenig@pengutronix.de wrote on Thu, 2 Nov 2023 23:02:47 +0100:
> Hello,
>
> this series is the successor to the series "mtd: Convert to platform
> remove callback returning" sent earlier starting with Message-Id:
> 20231008200143.196369-1-u.kleine-koenig@pengutronix.de.
>
> The brcmnand patch is new, my coccinelle script didn't find that one
> back then because the remove function is in a different compilation
> unit than the drivers.
>
> The txx9ndfmc driver now was converted to a normal platform_driver first
> (i.e. one that doesn't use platform_driver_probe()) as
> suggested/requested by Miquel.
>
> With this series all of drivers/mtd doesn't make use of
> platform_driver::remove any more and so we're ready to change this
> function according to the plan described in commit 5c5a7680e67b
> ("platform: Provide a remove callback that returns no value")
>
LGTM, I'll apply at -rc1.
Thanks,
Miquèl
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 5+ messages in thread