Skip to content

Commit b5ba32b

Browse files
Uwe Kleine-Königdamien-lemoal
authored andcommitted
ata: pata_mpc52xx: 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> Reviewed-by: Sergey Shtylyov <s.shtylyov@omp.ru> Signed-off-by: Damien Le Moal <dlemoal@kernel.org>
1 parent eb605fa commit b5ba32b

1 file changed

Lines changed: 2 additions & 5 deletions

File tree

drivers/ata/pata_mpc52xx.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -801,8 +801,7 @@ static int mpc52xx_ata_probe(struct platform_device *op)
801801
return rv;
802802
}
803803

804-
static int
805-
mpc52xx_ata_remove(struct platform_device *op)
804+
static void mpc52xx_ata_remove(struct platform_device *op)
806805
{
807806
struct ata_host *host = platform_get_drvdata(op);
808807
struct mpc52xx_ata_priv *priv = host->private_data;
@@ -816,8 +815,6 @@ mpc52xx_ata_remove(struct platform_device *op)
816815
irq_dispose_mapping(task_irq);
817816
bcom_ata_release(priv->dmatsk);
818817
irq_dispose_mapping(priv->ata_irq);
819-
820-
return 0;
821818
}
822819

823820
#ifdef CONFIG_PM_SLEEP
@@ -858,7 +855,7 @@ static const struct of_device_id mpc52xx_ata_of_match[] = {
858855

859856
static struct platform_driver mpc52xx_ata_of_platform_driver = {
860857
.probe = mpc52xx_ata_probe,
861-
.remove = mpc52xx_ata_remove,
858+
.remove_new = mpc52xx_ata_remove,
862859
#ifdef CONFIG_PM_SLEEP
863860
.suspend = mpc52xx_ata_suspend,
864861
.resume = mpc52xx_ata_resume,

0 commit comments

Comments
 (0)