Skip to content

Commit 3596b02

Browse files
Uwe Kleine-Königdamien-lemoal
authored andcommitted
ata: sata_mv: 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 114dda8 commit 3596b02

1 file changed

Lines changed: 2 additions & 3 deletions

File tree

drivers/ata/sata_mv.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4210,7 +4210,7 @@ static int mv_platform_probe(struct platform_device *pdev)
42104210
* A platform bus SATA device has been unplugged. Perform the needed
42114211
* cleanup. Also called on module unload for any active devices.
42124212
*/
4213-
static int mv_platform_remove(struct platform_device *pdev)
4213+
static void mv_platform_remove(struct platform_device *pdev)
42144214
{
42154215
struct ata_host *host = platform_get_drvdata(pdev);
42164216
struct mv_host_priv *hpriv = host->private_data;
@@ -4228,7 +4228,6 @@ static int mv_platform_remove(struct platform_device *pdev)
42284228
}
42294229
phy_power_off(hpriv->port_phys[port]);
42304230
}
4231-
return 0;
42324231
}
42334232

42344233
#ifdef CONFIG_PM_SLEEP
@@ -4284,7 +4283,7 @@ MODULE_DEVICE_TABLE(of, mv_sata_dt_ids);
42844283

42854284
static struct platform_driver mv_platform_driver = {
42864285
.probe = mv_platform_probe,
4287-
.remove = mv_platform_remove,
4286+
.remove_new = mv_platform_remove,
42884287
.suspend = mv_platform_suspend,
42894288
.resume = mv_platform_resume,
42904289
.driver = {

0 commit comments

Comments
 (0)