ata: sata_fsl: Convert to platform remove callback returning void

[platform/kernel/linux-starfive.git] / drivers / ata / sata_fsl.c

diff --git a/drivers/ata/sata_fsl.c b/drivers/ata/sata_fsl.c
index 16415eb..01aa05f 100644 (file)
--- a/drivers/ata/sata_fsl.c
+++ b/drivers/ata/sata_fsl.c
@@ -1526,7 +1526,7 @@ error_exit_with_cleanup:
        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 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);
 
        ata_host_detach(host);
-
-       return 0;
 }
 
 #ifdef CONFIG_PM_SLEEP
@@ -1591,7 +1589,7 @@ static struct platform_driver fsl_sata_driver = {
                .of_match_table = fsl_sata_match,
        },
        .probe          = sata_fsl_probe,
-       .remove         = sata_fsl_remove,
+       .remove_new     = sata_fsl_remove,
 #ifdef CONFIG_PM_SLEEP
        .suspend        = sata_fsl_suspend,
        .resume         = sata_fsl_resume,