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

ata: sata_fsl: 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>
Signed-off-by: default avatarDamien Le Moal <dlemoal@kernel.org>
parent ac1bc5f9

drivers/ata/sata_fsl.c

+2 −4
Original line number Original line Diff line number Diff line
@@ -1526,7 +1526,7 @@ static int sata_fsl_probe(struct platform_device *ofdev) 
	return retval;

	return retval;

}

}





static int sata_fsl_remove(struct platform_device *ofdev)

static void sata_fsl_remove(struct platform_device *ofdev)

{

{

	struct ata_host *host = platform_get_drvdata(ofdev);

	struct ata_host *host = platform_get_drvdata(ofdev);

	struct sata_fsl_host_priv *host_priv = host->private_data;

	struct sata_fsl_host_priv *host_priv = host->private_data;
@@ -1535,8 +1535,6 @@ static int sata_fsl_remove(struct platform_device *ofdev) 
	device_remove_file(&ofdev->dev, &host_priv->rx_watermark);

	device_remove_file(&ofdev->dev, &host_priv->rx_watermark);





	ata_host_detach(host);

	ata_host_detach(host);



	return 0;

}

}





#ifdef CONFIG_PM_SLEEP

#ifdef CONFIG_PM_SLEEP
@@ -1591,7 +1589,7 @@ static struct platform_driver fsl_sata_driver = { 
		.of_match_table = fsl_sata_match,

		.of_match_table = fsl_sata_match,

	},

	},

	.probe		= sata_fsl_probe,

	.probe		= sata_fsl_probe,

	.remove		= sata_fsl_remove,

	.remove_new	= sata_fsl_remove,

#ifdef CONFIG_PM_SLEEP

#ifdef CONFIG_PM_SLEEP

	.suspend	= sata_fsl_suspend,

	.suspend	= sata_fsl_suspend,

	.resume		= sata_fsl_resume,

	.resume		= sata_fsl_resume,