MIPS: lantiq: xway: Use devm_platform_get_and_ioremap_resource()

Convert platform_get_resource(), devm_ioremap_resource() to a single
call to devm_platform_get_and_ioremap_resource(), as this is exactly
what this function does.

Signed-off-by: Ye Xingchen <ye.xingchen@zte.com.cn>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>

diff --git a/arch/mips/lantiq/xway/dcdc.c b/arch/mips/lantiq/xway/dcdc.c
index 4960bee0a99d461b0b98d6d1b439f1975d815fe5..96199966a350df18feab326f24ee988529198ce8 100644 (file)
--- a/arch/mips/lantiq/xway/dcdc.c
+++ b/arch/mips/lantiq/xway/dcdc.c
@@ -22,10 +22,7 @@ static void __iomem *dcdc_membase;
 
 static int dcdc_probe(struct platform_device *pdev)
 {
-       struct resource *res;
-
-       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       dcdc_membase = devm_ioremap_resource(&pdev->dev, res);
+       dcdc_membase = devm_platform_get_and_ioremap_resource(pdev, 0, NULL);
        if (IS_ERR(dcdc_membase))
                return PTR_ERR(dcdc_membase);
 

diff --git a/arch/mips/lantiq/xway/dma.c b/arch/mips/lantiq/xway/dma.c
index f8eedeb15f182992d56849de2de831f0b0cdd259..934ac72937e5fa6c80f7a94be75d483353549f2c 100644 (file)
--- a/arch/mips/lantiq/xway/dma.c
+++ b/arch/mips/lantiq/xway/dma.c
@@ -239,12 +239,10 @@ static int
 ltq_dma_init(struct platform_device *pdev)
 {
        struct clk *clk;
-       struct resource *res;
        unsigned int id, nchannels;
        int i;
 
-       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       ltq_dma_membase = devm_ioremap_resource(&pdev->dev, res);
+       ltq_dma_membase = devm_platform_get_and_ioremap_resource(pdev, 0, NULL);
        if (IS_ERR(ltq_dma_membase))
                panic("Failed to remap dma resource");
 

diff --git a/arch/mips/lantiq/xway/gptu.c b/arch/mips/lantiq/xway/gptu.c
index 200fe9ff641d67fb256815a54af57be7ea38e0a6..a492b1eb19250d82a164dd15785efa6021e33a85 100644 (file)
--- a/arch/mips/lantiq/xway/gptu.c
+++ b/arch/mips/lantiq/xway/gptu.c
@@ -136,17 +136,14 @@ static inline void clkdev_add_gptu(struct device *dev, const char *con,
 static int gptu_probe(struct platform_device *pdev)
 {
        struct clk *clk;
-       struct resource *res;
 
        if (of_irq_to_resource_table(pdev->dev.of_node, irqres, 6) != 6) {
                dev_err(&pdev->dev, "Failed to get IRQ list\n");
                return -EINVAL;
        }
 
-       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-
        /* remap gptu register range */
-       gptu_membase = devm_ioremap_resource(&pdev->dev, res);
+       gptu_membase = devm_platform_get_and_ioremap_resource(pdev, 0, NULL);
        if (IS_ERR(gptu_membase))
                return PTR_ERR(gptu_membase);