media: qcom/camss: Use devm_platform_ioremap_resource_byname

Use the devm_platform_ioremap_resource_byname() helper instead of
calling platform_get_resource_byname() and devm_ioremap_resource()
separately.

Signed-off-by: dingsenjie <dingsenjie@yulong.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/media/platform/qcom/camss/camss-csid.c b/drivers/media/platform/qcom/camss/camss-csid.c
index cc11fbf..0e6b76e 100644 (file)
--- a/drivers/media/platform/qcom/camss/camss-csid.c
+++ b/drivers/media/platform/qcom/camss/camss-csid.c
@@ -566,8 +566,7 @@ int msm_csid_subdev_init(struct camss *camss, struct csid_device *csid,
 
        /* Memory */
 
-       r = platform_get_resource_byname(pdev, IORESOURCE_MEM, res->reg[0]);
-       csid->base = devm_ioremap_resource(dev, r);
+       csid->base = devm_platform_ioremap_resource_byname(pdev, res->reg[0]);
        if (IS_ERR(csid->base))
                return PTR_ERR(csid->base);
 

diff --git a/drivers/media/platform/qcom/camss/camss-csiphy.c b/drivers/media/platform/qcom/camss/camss-csiphy.c
index b3c3bf1..1996541 100644 (file)
--- a/drivers/media/platform/qcom/camss/camss-csiphy.c
+++ b/drivers/media/platform/qcom/camss/camss-csiphy.c
@@ -591,16 +591,14 @@ int msm_csiphy_subdev_init(struct camss *camss,
 
        /* Memory */
 
-       r = platform_get_resource_byname(pdev, IORESOURCE_MEM, res->reg[0]);
-       csiphy->base = devm_ioremap_resource(dev, r);
+       csiphy->base = devm_platform_ioremap_resource_byname(pdev, res->reg[0]);
        if (IS_ERR(csiphy->base))
                return PTR_ERR(csiphy->base);
 
        if (camss->version == CAMSS_8x16 ||
            camss->version == CAMSS_8x96) {
-               r = platform_get_resource_byname(pdev, IORESOURCE_MEM,
-                                                res->reg[1]);
-               csiphy->base_clk_mux = devm_ioremap_resource(dev, r);
+               csiphy->base_clk_mux =
+                       devm_platform_ioremap_resource_byname(pdev, res->reg[1]);
                if (IS_ERR(csiphy->base_clk_mux))
                        return PTR_ERR(csiphy->base_clk_mux);
        } else {

diff --git a/drivers/media/platform/qcom/camss/camss-ispif.c b/drivers/media/platform/qcom/camss/camss-ispif.c
index 37611c8..d7942f7 100644 (file)
--- a/drivers/media/platform/qcom/camss/camss-ispif.c
+++ b/drivers/media/platform/qcom/camss/camss-ispif.c
@@ -1143,13 +1143,11 @@ int msm_ispif_subdev_init(struct camss *camss,
 
        /* Memory */
 
-       r = platform_get_resource_byname(pdev, IORESOURCE_MEM, res->reg[0]);
-       ispif->base = devm_ioremap_resource(dev, r);
+       ispif->base = devm_platform_ioremap_resource_byname(pdev, res->reg[0]);
        if (IS_ERR(ispif->base))
                return PTR_ERR(ispif->base);
 
-       r = platform_get_resource_byname(pdev, IORESOURCE_MEM, res->reg[1]);
-       ispif->base_clk_mux = devm_ioremap_resource(dev, r);
+       ispif->base_clk_mux = devm_platform_ioremap_resource_byname(pdev, res->reg[1]);
        if (IS_ERR(ispif->base_clk_mux))
                return PTR_ERR(ispif->base_clk_mux);
 

diff --git a/drivers/media/platform/qcom/camss/camss-vfe.c b/drivers/media/platform/qcom/camss/camss-vfe.c
index 15695fd..1584ee7 100644 (file)
--- a/drivers/media/platform/qcom/camss/camss-vfe.c
+++ b/drivers/media/platform/qcom/camss/camss-vfe.c
@@ -1301,8 +1301,7 @@ int msm_vfe_subdev_init(struct camss *camss, struct vfe_device *vfe,
 
        /* Memory */
 
-       r = platform_get_resource_byname(pdev, IORESOURCE_MEM, res->reg[0]);
-       vfe->base = devm_ioremap_resource(dev, r);
+       vfe->base = devm_platform_ioremap_resource_byname(pdev, res->reg[0]);
        if (IS_ERR(vfe->base)) {
                dev_err(dev, "could not map memory\n");
                return PTR_ERR(vfe->base);