Commit b5ba32b6 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Damien Le Moal
Browse files

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: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Reviewed-by: default avatarSergey Shtylyov <s.shtylyov@omp.ru>
Signed-off-by: default avatarDamien Le Moal <dlemoal@kernel.org>
parent eb605fa6

drivers/ata/pata_mpc52xx.c

+2 −5
Original line number Diff line number Diff line
@@ -801,8 +801,7 @@ static int mpc52xx_ata_probe(struct platform_device *op) 
	return rv;

}



static int

mpc52xx_ata_remove(struct platform_device *op)

static void mpc52xx_ata_remove(struct platform_device *op)

{

	struct ata_host *host = platform_get_drvdata(op);

	struct mpc52xx_ata_priv *priv = host->private_data;
@@ -816,8 +815,6 @@ mpc52xx_ata_remove(struct platform_device *op) 
	irq_dispose_mapping(task_irq);

	bcom_ata_release(priv->dmatsk);

	irq_dispose_mapping(priv->ata_irq);



	return 0;

}



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


static struct platform_driver mpc52xx_ata_of_platform_driver = {

	.probe		= mpc52xx_ata_probe,

	.remove		= mpc52xx_ata_remove,

	.remove_new	= mpc52xx_ata_remove,

#ifdef CONFIG_PM_SLEEP

	.suspend	= mpc52xx_ata_suspend,

	.resume		= mpc52xx_ata_resume,