Skip to content

Commit ac1bc5f

Browse files
Uwe Kleine-Königdamien-lemoal
authored andcommitted
ata: sata_dwc_460ex: 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() is 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 <u.kleine-koenig@pengutronix.de> Signed-off-by: Damien Le Moal <dlemoal@kernel.org>
1 parent d6ef90f commit ac1bc5f

1 file changed

Lines changed: 2 additions & 3 deletions

File tree

drivers/ata/sata_dwc_460ex.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1210,7 +1210,7 @@ static int sata_dwc_probe(struct platform_device *ofdev)
12101210
return err;
12111211
}
12121212

1213-
static int sata_dwc_remove(struct platform_device *ofdev)
1213+
static void sata_dwc_remove(struct platform_device *ofdev)
12141214
{
12151215
struct device *dev = &ofdev->dev;
12161216
struct ata_host *host = dev_get_drvdata(dev);
@@ -1226,7 +1226,6 @@ static int sata_dwc_remove(struct platform_device *ofdev)
12261226
#endif
12271227

12281228
dev_dbg(dev, "done\n");
1229-
return 0;
12301229
}
12311230

12321231
static const struct of_device_id sata_dwc_match[] = {
@@ -1241,7 +1240,7 @@ static struct platform_driver sata_dwc_driver = {
12411240
.of_match_table = sata_dwc_match,
12421241
},
12431242
.probe = sata_dwc_probe,
1244-
.remove = sata_dwc_remove,
1243+
.remove_new = sata_dwc_remove,
12451244
};
12461245

12471246
module_platform_driver(sata_dwc_driver);

0 commit comments

Comments
 (0)