Merge tag 'ata-5.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal...

[linux-2.6-microblaze.git] / drivers / ata / sata_fsl.c

diff --git a/drivers/ata/sata_fsl.c b/drivers/ata/sata_fsl.c
index 556034a..b9a4f68 100644 (file)
--- a/drivers/ata/sata_fsl.c
+++ b/drivers/ata/sata_fsl.c
@@ -1544,7 +1544,9 @@ static int sata_fsl_remove(struct platform_device *ofdev)
 static int sata_fsl_suspend(struct platform_device *op, pm_message_t state)
 {
        struct ata_host *host = platform_get_drvdata(op);
-       return ata_host_suspend(host, state);
+
+       ata_host_suspend(host, state);
+       return 0;
 }
 
 static int sata_fsl_resume(struct platform_device *op)
@@ -1577,13 +1579,9 @@ static int sata_fsl_resume(struct platform_device *op)
 #endif
 
 static const struct of_device_id fsl_sata_match[] = {
-       {
-               .compatible = "fsl,pq-sata",
-       },
-       {
-               .compatible = "fsl,pq-sata-v2",
-       },
-       {},
+       { .compatible = "fsl,pq-sata", },
+       { .compatible = "fsl,pq-sata-v2", },
+       { /* sentinel */ }
 };
 
 MODULE_DEVICE_TABLE(of, fsl_sata_match);