i2c: busses: convert to devm_platform_get_and_ioremap_resource

use devm_platform_get_and_ioremap_resource() to simplify code, which
contains platform_get_resource() and devm_ioremap_resource(), it also
get the resource for use by the following code.

Signed-off-by: Dejin Zheng <zhengdejin5@gmail.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>

diff --git a/drivers/i2c/busses/i2c-cadence.c b/drivers/i2c/busses/i2c-cadence.c
index 89d58f7d2a253814a95d14581901754b9c0cac65..803c802611eb5354aa33da6dc03e4dd8bcb52ac9 100644 (file)
--- a/drivers/i2c/busses/i2c-cadence.c
+++ b/drivers/i2c/busses/i2c-cadence.c
@@ -906,8 +906,7 @@ static int cdns_i2c_probe(struct platform_device *pdev)
                id->quirks = data->quirks;
        }
 
-       r_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       id->membase = devm_ioremap_resource(&pdev->dev, r_mem);
+       id->membase = devm_platform_get_and_ioremap_resource(pdev, 0, &r_mem);
        if (IS_ERR(id->membase))
                return PTR_ERR(id->membase);
 

diff --git a/drivers/i2c/busses/i2c-pca-platform.c b/drivers/i2c/busses/i2c-pca-platform.c
index 635dd697ac0bbda3bdc8fe73bd4014bbb14a1b36..546426a470cc0c75cdbcdfc0ea0ad81f1318a638 100644 (file)
--- a/drivers/i2c/busses/i2c-pca-platform.c
+++ b/drivers/i2c/busses/i2c-pca-platform.c
@@ -149,8 +149,7 @@ static int i2c_pca_pf_probe(struct platform_device *pdev)
        if (!i2c)
                return -ENOMEM;
 
-       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       i2c->reg_base = devm_ioremap_resource(&pdev->dev, res);
+       i2c->reg_base = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
        if (IS_ERR(i2c->reg_base))
                return PTR_ERR(i2c->reg_base);
 

diff --git a/drivers/i2c/busses/i2c-rcar.c b/drivers/i2c/busses/i2c-rcar.c
index 3b5397aa4ca602fea2e24f842c8dd0ce5b48fdc2..a45c4bf1ec014e84b314c042edc365294a6de027 100644 (file)
--- a/drivers/i2c/busses/i2c-rcar.c
+++ b/drivers/i2c/busses/i2c-rcar.c
@@ -938,9 +938,7 @@ static int rcar_i2c_probe(struct platform_device *pdev)
                return PTR_ERR(priv->clk);
        }
 
-       priv->res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-
-       priv->io = devm_ioremap_resource(dev, priv->res);
+       priv->io = devm_platform_get_and_ioremap_resource(pdev, 0, &priv->res);
        if (IS_ERR(priv->io))
                return PTR_ERR(priv->io);
 

diff --git a/drivers/i2c/busses/i2c-stm32f7.c b/drivers/i2c/busses/i2c-stm32f7.c
index 330ffed011e022d1b863e3ef63599106e0c0202b..cf48f8df4423aafa714c00da6129e209be7c74b9 100644 (file)
--- a/drivers/i2c/busses/i2c-stm32f7.c
+++ b/drivers/i2c/busses/i2c-stm32f7.c
@@ -1940,8 +1940,7 @@ static int stm32f7_i2c_probe(struct platform_device *pdev)
        if (!i2c_dev)
                return -ENOMEM;
 
-       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       i2c_dev->base = devm_ioremap_resource(&pdev->dev, res);
+       i2c_dev->base = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
        if (IS_ERR(i2c_dev->base))
                return PTR_ERR(i2c_dev->base);
        phy_addr = (dma_addr_t)res->start;