ata: pata_platform: Make use of platform_get_mem_or_io()

Make use of platform_get_mem_or_io() to simplify the code.

While at it, drop use of unlikely() from pata_platform_probe()
as it isn't a hotpath.

Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Reviewed-by: Sergey Shtylyov <s.shtylyov@omp.ru>
Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>

diff --git a/drivers/ata/pata_platform.c b/drivers/ata/pata_platform.c
index 87c7c90676ca019ab8efcc9b3aa61f35d69ff781..21fb059859bdd240c1d339b5754036270b5a434b 100644 (file)
--- a/drivers/ata/pata_platform.c
+++ b/drivers/ata/pata_platform.c
@@ -200,22 +200,16 @@ static int pata_platform_probe(struct platform_device *pdev)
        /*
         * Get the I/O base first
         */
-       io_res = platform_get_resource(pdev, IORESOURCE_IO, 0);
-       if (io_res == NULL) {
-               io_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-               if (unlikely(io_res == NULL))
-                       return -EINVAL;
-       }
+       io_res = platform_get_mem_or_io(pdev, 0);
+       if (!io_res)
+               return -EINVAL;
 
        /*
         * Then the CTL base
         */
-       ctl_res = platform_get_resource(pdev, IORESOURCE_IO, 1);
-       if (ctl_res == NULL) {
-               ctl_res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
-               if (unlikely(ctl_res == NULL))
-                       return -EINVAL;
-       }
+       ctl_res = platform_get_mem_or_io(pdev, 1);
+       if (!ctl_res)
+               return -EINVAL;
 
        /*
         * And the IRQ