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

ata: libata: Make ata_platform_remove_one return void 



The function returned zero unconditionally, so the function returning an
int is something between useless and irritating. With the goal to make
platform drivers' remove function return void, it's helpful to convert
the function accordingly. This converts several drivers to the new
.remove_new callback that was introduced to smoothen the platform driver
conversion.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: default avatarJernej Skrabec <jernej.skrabec@gmail.com>
Acked-by: default avatarSerge Semin <fancer.lancer@gmail.com>
Reviewed-by: default avatarSergey Shtylyov <s.shtylyov@omp.ru>
Signed-off-by: default avatarDamien Le Moal <dlemoal@kernel.org>
parent f1fcbaa1

drivers/ata/ahci_brcm.c

+3 −3
Original line number Diff line number Diff line
@@ -544,7 +544,7 @@ static int brcm_ahci_probe(struct platform_device *pdev) 
	return ret;

}



static int brcm_ahci_remove(struct platform_device *pdev)

static void brcm_ahci_remove(struct platform_device *pdev)

{

	struct ata_host *host = dev_get_drvdata(&pdev->dev);

	struct ahci_host_priv *hpriv = host->private_data;
@@ -552,7 +552,7 @@ static int brcm_ahci_remove(struct platform_device *pdev) 


	brcm_sata_phys_disable(priv);



	return ata_platform_remove_one(pdev);

	ata_platform_remove_one(pdev);

}



static void brcm_ahci_shutdown(struct platform_device *pdev)
@@ -573,7 +573,7 @@ static SIMPLE_DEV_PM_OPS(ahci_brcm_pm_ops, brcm_ahci_suspend, brcm_ahci_resume); 


static struct platform_driver brcm_ahci_driver = {

	.probe = brcm_ahci_probe,

	.remove = brcm_ahci_remove,

	.remove_new = brcm_ahci_remove,

	.shutdown = brcm_ahci_shutdown,

	.driver = {

		.name = DRV_NAME,

drivers/ata/ahci_ceva.c

+1 −1
Original line number Diff line number Diff line
@@ -369,7 +369,7 @@ MODULE_DEVICE_TABLE(of, ceva_ahci_of_match); 


static struct platform_driver ceva_ahci_driver = {

	.probe = ceva_ahci_probe,

	.remove = ata_platform_remove_one,

	.remove_new = ata_platform_remove_one,

	.driver = {

		.name = DRV_NAME,

		.of_match_table = ceva_ahci_of_match,

drivers/ata/ahci_da850.c

+1 −1
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ MODULE_DEVICE_TABLE(of, ahci_da850_of_match); 


static struct platform_driver ahci_da850_driver = {

	.probe = ahci_da850_probe,

	.remove = ata_platform_remove_one,

	.remove_new = ata_platform_remove_one,

	.driver = {

		.name = DRV_NAME,

		.of_match_table = ahci_da850_of_match,

drivers/ata/ahci_dm816.c

+1 −1
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ MODULE_DEVICE_TABLE(of, ahci_dm816_of_match); 


static struct platform_driver ahci_dm816_driver = {

	.probe = ahci_dm816_probe,

	.remove = ata_platform_remove_one,

	.remove_new = ata_platform_remove_one,

	.driver = {

		.name = AHCI_DM816_DRV_NAME,

		.of_match_table = ahci_dm816_of_match,

drivers/ata/ahci_dwc.c

+1 −1
Original line number Diff line number Diff line
@@ -478,7 +478,7 @@ MODULE_DEVICE_TABLE(of, ahci_dwc_of_match); 


static struct platform_driver ahci_dwc_driver = {

	.probe = ahci_dwc_probe,

	.remove = ata_platform_remove_one,

	.remove_new = ata_platform_remove_one,

	.shutdown = ahci_platform_shutdown,

	.driver = {

		.name = DRV_NAME,