MIPS: OCTEON: use devm_platform_ioremap_resource

Note that error handling on the result of a call to platform_get_resource()
is unneeded when the value is passed to devm_ioremap_resource(), so remove
it. Then use the helper function that wraps the calls to
platform_get_resource() and devm_ioremap_resource() together.

Signed-off-by: Qinglang Miao <miaoqinglang@huawei.com>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>

diff --git a/arch/mips/cavium-octeon/octeon-usb.c b/arch/mips/cavium-octeon/octeon-usb.c
index 950e6c6..97f6dc3 100644 (file)
--- a/arch/mips/cavium-octeon/octeon-usb.c
+++ b/arch/mips/cavium-octeon/octeon-usb.c
@@ -498,7 +498,6 @@ static int __init dwc3_octeon_device_init(void)
        const char compat_node_name[] = "cavium,octeon-7130-usb-uctl";
        struct platform_device *pdev;
        struct device_node *node;
-       struct resource *res;
        void __iomem *base;
 
        /*
@@ -516,20 +515,13 @@ static int __init dwc3_octeon_device_init(void)
                        if (!pdev)
                                return -ENODEV;
 
-                       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-                       if (res == NULL) {
-                               put_device(&pdev->dev);
-                               dev_err(&pdev->dev, "No memory resources\n");
-                               return -ENXIO;
-                       }
-
                        /*
                         * The code below maps in the registers necessary for
                         * setting up the clocks and reseting PHYs. We must
                         * release the resources so the dwc3 subsystem doesn't
                         * know the difference.
                         */
-                       base = devm_ioremap_resource(&pdev->dev, res);
+                       base = devm_platform_ioremap_resource(pdev, 0);
                        if (IS_ERR(base)) {
                                put_device(&pdev->dev);
                                return PTR_ERR(base);