Skip to content

Commit eb0cec7

Browse files
Uwe Kleine-Königmiquelraynal
authored andcommitted
mtd: docg3: 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(). Trivially convert this driver from always returning zero in the remove callback to the void returning variant. Signed-off-by: Uwe Kleine-König <[email protected]> Signed-off-by: Miquel Raynal <[email protected]> Acked-by: Tudor Ambarus <[email protected]> Link: https://lore.kernel.org/linux-mtd/[email protected]
1 parent 0e0672a commit eb0cec7

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

drivers/mtd/devices/docg3.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2046,7 +2046,7 @@ static int __init docg3_probe(struct platform_device *pdev)
20462046
*
20472047
* Returns 0
20482048
*/
2049-
static int docg3_release(struct platform_device *pdev)
2049+
static void docg3_release(struct platform_device *pdev)
20502050
{
20512051
struct docg3_cascade *cascade = platform_get_drvdata(pdev);
20522052
struct docg3 *docg3 = cascade->floors[0]->priv;
@@ -2058,7 +2058,6 @@ static int docg3_release(struct platform_device *pdev)
20582058
doc_release_device(cascade->floors[floor]);
20592059

20602060
bch_free(docg3->cascade->bch);
2061-
return 0;
20622061
}
20632062

20642063
#ifdef CONFIG_OF
@@ -2076,7 +2075,7 @@ static struct platform_driver g3_driver = {
20762075
},
20772076
.suspend = docg3_suspend,
20782077
.resume = docg3_resume,
2079-
.remove = docg3_release,
2078+
.remove_new = docg3_release,
20802079
};
20812080

20822081
module_platform_driver_probe(g3_driver, docg3_probe);

0 commit comments

Comments
 (0)