drm/omap: Make use of the helper function devm_platform_ioremap_resourcexxx()

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

Use the devm_platform_ioremap_resource() helper instead of
calling platform_get_resource() and devm_ioremap_resource()
separately

Signed-off-by: Cai Huoqing <caihuoqing@baidu.com>
Reviewed-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210831135707.4676-1-caihuoqing@baidu.com

diff --git a/drivers/gpu/drm/omapdrm/dss/dispc.c b/drivers/gpu/drm/omapdrm/dss/dispc.c
index a23587c58555ee0d5886695b33e92c5df36cabe1..24ba1d0831de7320cb6dfc97b293ea62e3839286 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/dispc.c
+++ b/drivers/gpu/drm/omapdrm/dss/dispc.c
@@ -4725,7 +4725,6 @@ static int dispc_bind(struct device *dev, struct device *master, void *data)
        struct dispc_device *dispc;
        u32 rev;
        int r = 0;
-       struct resource *dispc_mem;
        struct device_node *np = pdev->dev.of_node;
 
        dispc = kzalloc(sizeof(*dispc), GFP_KERNEL);
@@ -4750,8 +4749,7 @@ static int dispc_bind(struct device *dev, struct device *master, void *data)
        if (r)
                goto err_free;
 
-       dispc_mem = platform_get_resource(dispc->pdev, IORESOURCE_MEM, 0);
-       dispc->base = devm_ioremap_resource(&pdev->dev, dispc_mem);
+       dispc->base = devm_platform_ioremap_resource(pdev, 0);
        if (IS_ERR(dispc->base)) {
                r = PTR_ERR(dispc->base);
                goto err_free;

diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c
index 806aafc7754921e38f032e5c0399d17eac14c55d..d730bf67fed942d9962417aa9f80a35bfbe2236d 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/dsi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dsi.c
@@ -4884,7 +4884,6 @@ static int dsi_probe(struct platform_device *pdev)
        struct device *dev = &pdev->dev;
        struct dsi_data *dsi;
        struct resource *dsi_mem;
-       struct resource *res;
        unsigned int i;
        int r;
 
@@ -4921,13 +4920,11 @@ static int dsi_probe(struct platform_device *pdev)
        if (IS_ERR(dsi->proto_base))
                return PTR_ERR(dsi->proto_base);
 
-       res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "phy");
-       dsi->phy_base = devm_ioremap_resource(dev, res);
+       dsi->phy_base = devm_platform_ioremap_resource_byname(pdev, "phy");
        if (IS_ERR(dsi->phy_base))
                return PTR_ERR(dsi->phy_base);
 
-       res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "pll");
-       dsi->pll_base = devm_ioremap_resource(dev, res);
+       dsi->pll_base = devm_platform_ioremap_resource_byname(pdev, "pll");
        if (IS_ERR(dsi->pll_base))
                return PTR_ERR(dsi->pll_base);
 

diff --git a/drivers/gpu/drm/omapdrm/dss/dss.c b/drivers/gpu/drm/omapdrm/dss/dss.c
index 7a4581bf63e6bd2cb34ffa3b6f631ecfa4ba8ff5..66db28bfe824f3e8f5d8eaa60ca57645f5320349 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/dss.c
+++ b/drivers/gpu/drm/omapdrm/dss/dss.c
@@ -1424,7 +1424,6 @@ static int dss_probe(struct platform_device *pdev)
        const struct soc_device_attribute *soc;
        struct dss_component_match_data cmatch;
        struct component_match *match = NULL;
-       struct resource *dss_mem;
        struct dss_device *dss;
        int r;
 
@@ -1452,8 +1451,7 @@ static int dss_probe(struct platform_device *pdev)
                dss->feat = of_match_device(dss_of_match, &pdev->dev)->data;
 
        /* Map I/O registers, get and setup clocks. */
-       dss_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       dss->base = devm_ioremap_resource(&pdev->dev, dss_mem);
+       dss->base = devm_platform_ioremap_resource(pdev, 0);
        if (IS_ERR(dss->base)) {
                r = PTR_ERR(dss->base);
                goto err_free_dss;

diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi4_core.c b/drivers/gpu/drm/omapdrm/dss/hdmi4_core.c
index 35faa7f028c467c9e7a4f4dd40048e086513e371..8720bf4f18fe8b3d03b968e01cc1e46a14031a53 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/hdmi4_core.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi4_core.c
@@ -870,7 +870,6 @@ static const struct soc_device_attribute hdmi4_soc_devices[] = {
 int hdmi4_core_init(struct platform_device *pdev, struct hdmi_core_data *core)
 {
        const struct hdmi4_features *features;
-       struct resource *res;
        const struct soc_device_attribute *soc;
 
        soc = soc_device_match(hdmi4_soc_devices);
@@ -881,8 +880,7 @@ int hdmi4_core_init(struct platform_device *pdev, struct hdmi_core_data *core)
        core->cts_swmode = features->cts_swmode;
        core->audio_use_mclk = features->audio_use_mclk;
 
-       res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "core");
-       core->base = devm_ioremap_resource(&pdev->dev, res);
+       core->base = devm_platform_ioremap_resource_byname(pdev, "core");
        if (IS_ERR(core->base))
                return PTR_ERR(core->base);
 

diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi5_core.c b/drivers/gpu/drm/omapdrm/dss/hdmi5_core.c
index 6cc2ad7a420cb03eb7310c7b89635b7448fdffe0..21564c38234fa92f0741c6415c52471c2d618c71 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/hdmi5_core.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi5_core.c
@@ -872,10 +872,7 @@ int hdmi5_audio_config(struct hdmi_core_data *core, struct hdmi_wp_data *wp,
 
 int hdmi5_core_init(struct platform_device *pdev, struct hdmi_core_data *core)
 {
-       struct resource *res;
-
-       res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "core");
-       core->base = devm_ioremap_resource(&pdev->dev, res);
+       core->base = devm_platform_ioremap_resource_byname(pdev, "core");
        if (IS_ERR(core->base))
                return PTR_ERR(core->base);
 

diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi_phy.c b/drivers/gpu/drm/omapdrm/dss/hdmi_phy.c
index 5dc200f09c3c48b8806c4cbbbb2444f678ab5576..060e8f76f2be4cfdde5d147cdf1b9bfbacf56076 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/hdmi_phy.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi_phy.c
@@ -182,15 +182,12 @@ static const struct hdmi_phy_features omap54xx_phy_feats = {
 int hdmi_phy_init(struct platform_device *pdev, struct hdmi_phy_data *phy,
                  unsigned int version)
 {
-       struct resource *res;
-
        if (version == 4)
                phy->features = &omap44xx_phy_feats;
        else
                phy->features = &omap54xx_phy_feats;
 
-       res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "phy");
-       phy->base = devm_ioremap_resource(&pdev->dev, res);
+       phy->base = devm_platform_ioremap_resource_byname(pdev, "phy");
        if (IS_ERR(phy->base))
                return PTR_ERR(phy->base);
 

diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi_pll.c b/drivers/gpu/drm/omapdrm/dss/hdmi_pll.c
index 13bf649aba52a9c639d0bc5c83f3e73f83b1bced..eea719243eafe24db498521d6432856fe45c6f4e 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/hdmi_pll.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi_pll.c
@@ -162,13 +162,11 @@ int hdmi_pll_init(struct dss_device *dss, struct platform_device *pdev,
                  struct hdmi_pll_data *pll, struct hdmi_wp_data *wp)
 {
        int r;
-       struct resource *res;
 
        pll->pdev = pdev;
        pll->wp = wp;
 
-       res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "pll");
-       pll->base = devm_ioremap_resource(&pdev->dev, res);
+       pll->base = devm_platform_ioremap_resource_byname(pdev, "pll");
        if (IS_ERR(pll->base))
                return PTR_ERR(pll->base);
 

diff --git a/drivers/gpu/drm/omapdrm/dss/venc.c b/drivers/gpu/drm/omapdrm/dss/venc.c
index 37d9cf876c2724bb8c929e3edad387c80d61b68d..508fddd376cf701c8cd28f44e4b96d616101a682 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/venc.c
+++ b/drivers/gpu/drm/omapdrm/dss/venc.c
@@ -806,7 +806,6 @@ static const struct soc_device_attribute venc_soc_devices[] = {
 static int venc_probe(struct platform_device *pdev)
 {
        struct venc_device *venc;
-       struct resource *venc_mem;
        int r;
 
        venc = kzalloc(sizeof(*venc), GFP_KERNEL);
@@ -823,8 +822,7 @@ static int venc_probe(struct platform_device *pdev)
 
        venc->config = &venc_config_pal_trm;
 
-       venc_mem = platform_get_resource(venc->pdev, IORESOURCE_MEM, 0);
-       venc->base = devm_ioremap_resource(&pdev->dev, venc_mem);
+       venc->base = devm_platform_ioremap_resource(pdev, 0);
        if (IS_ERR(venc->base)) {
                r = PTR_ERR(venc->base);
                goto err_free;

diff --git a/drivers/gpu/drm/omapdrm/dss/video-pll.c b/drivers/gpu/drm/omapdrm/dss/video-pll.c
index b72c3ffddc9a2d04e6581dc8890c83fa7bd36081..b6b52049f753658b47c5de0803ab14bc841ed487 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/video-pll.c
+++ b/drivers/gpu/drm/omapdrm/dss/video-pll.c
@@ -137,7 +137,6 @@ struct dss_pll *dss_video_pll_init(struct dss_device *dss,
        const char * const clkctrl_name[] = { "pll1_clkctrl", "pll2_clkctrl" };
        const char * const clkin_name[] = { "video1_clk", "video2_clk" };
 
-       struct resource *res;
        struct dss_video_pll *vpll;
        void __iomem *pll_base, *clkctrl_base;
        struct clk *clk;
@@ -146,16 +145,13 @@ struct dss_pll *dss_video_pll_init(struct dss_device *dss,
 
        /* PLL CONTROL */
 
-       res = platform_get_resource_byname(pdev, IORESOURCE_MEM, reg_name[id]);
-       pll_base = devm_ioremap_resource(&pdev->dev, res);
+       pll_base = devm_platform_ioremap_resource_byname(pdev, reg_name[id]);
        if (IS_ERR(pll_base))
                return ERR_CAST(pll_base);
 
        /* CLOCK CONTROL */
 
-       res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
-               clkctrl_name[id]);
-       clkctrl_base = devm_ioremap_resource(&pdev->dev, res);
+       clkctrl_base = devm_platform_ioremap_resource_byname(pdev, clkctrl_name[id]);
        if (IS_ERR(clkctrl_base))
                return ERR_CAST(clkctrl_base);