omapfb: 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: Qilong Zhang <zhangqilong3@huawei.com>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
[fixed warning - unused variable]
[fixed checkpatch warning - fixed indent]
Link: https://patchwork.freedesktop.org/patch/msgid/20200916111353.105914-1-zhangqilong3@huawei.com

diff --git a/drivers/video/fbdev/omap2/omapfb/dss/hdmi4_core.c b/drivers/video/fbdev/omap2/omapfb/dss/hdmi4_core.c
index 7ca1803..726c190 100644 (file)
--- a/drivers/video/fbdev/omap2/omapfb/dss/hdmi4_core.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/hdmi4_core.c
@@ -875,15 +875,7 @@ void hdmi4_audio_stop(struct hdmi_core_data *core, struct hdmi_wp_data *wp)
 
 int hdmi4_core_init(struct platform_device *pdev, struct hdmi_core_data *core)
 {
-       struct resource *res;
-
-       res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "core");
-       if (!res) {
-               DSSERR("can't get CORE mem resource\n");
-               return -EINVAL;
-       }
-
-       core->base = devm_ioremap_resource(&pdev->dev, res);
+       core->base = devm_platform_ioremap_resource_byname(pdev, "core");
        if (IS_ERR(core->base)) {
                DSSERR("can't ioremap CORE\n");
                return PTR_ERR(core->base);

diff --git a/drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.c b/drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.c
index 2f6ff14..eda29d3 100644 (file)
--- a/drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.c
@@ -887,15 +887,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");
-       if (!res) {
-               DSSERR("can't get CORE IORESOURCE_MEM HDMI\n");
-               return -EINVAL;
-       }
-
-       core->base = devm_ioremap_resource(&pdev->dev, res);
+       core->base = devm_platform_ioremap_resource_byname(pdev, "core");
        if (IS_ERR(core->base)) {
                DSSERR("can't ioremap HDMI core\n");
                return PTR_ERR(core->base);

diff --git a/drivers/video/fbdev/omap2/omapfb/dss/hdmi_phy.c b/drivers/video/fbdev/omap2/omapfb/dss/hdmi_phy.c
index 9c645ad..6fbfeb0 100644 (file)
--- a/drivers/video/fbdev/omap2/omapfb/dss/hdmi_phy.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/hdmi_phy.c
@@ -207,19 +207,11 @@ static const struct hdmi_phy_features *hdmi_phy_get_features(void)
 
 int hdmi_phy_init(struct platform_device *pdev, struct hdmi_phy_data *phy)
 {
-       struct resource *res;
-
        phy_feat = hdmi_phy_get_features();
        if (!phy_feat)
                return -ENODEV;
 
-       res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "phy");
-       if (!res) {
-               DSSERR("can't get PHY mem resource\n");
-               return -EINVAL;
-       }
-
-       phy->base = devm_ioremap_resource(&pdev->dev, res);
+       phy->base = devm_platform_ioremap_resource_byname(pdev, "phy");
        if (IS_ERR(phy->base)) {
                DSSERR("can't ioremap TX PHY\n");
                return PTR_ERR(phy->base);

diff --git a/drivers/video/fbdev/omap2/omapfb/dss/hdmi_pll.c b/drivers/video/fbdev/omap2/omapfb/dss/hdmi_pll.c
index a36e921..c5f8912 100644 (file)
--- a/drivers/video/fbdev/omap2/omapfb/dss/hdmi_pll.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/hdmi_pll.c
@@ -100,7 +100,6 @@ static int hdmi_pll_enable(struct dss_pll *dsspll)
 {
        struct hdmi_pll_data *pll = container_of(dsspll, struct hdmi_pll_data, pll);
        struct hdmi_wp_data *wp = pll->wp;
-       u16 r = 0;
 
        dss_ctrl_pll_enable(DSS_PLL_HDMI, true);
 
@@ -216,17 +215,10 @@ int hdmi_pll_init(struct platform_device *pdev, struct hdmi_pll_data *pll,
        struct hdmi_wp_data *wp)
 {
        int r;
-       struct resource *res;
 
        pll->wp = wp;
 
-       res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "pll");
-       if (!res) {
-               DSSERR("can't get PLL mem resource\n");
-               return -EINVAL;
-       }
-
-       pll->base = devm_ioremap_resource(&pdev->dev, res);
+       pll->base = devm_platform_ioremap_resource_byname(pdev, "pll");
        if (IS_ERR(pll->base)) {
                DSSERR("can't ioremap PLLCTRL\n");
                return PTR_ERR(pll->base);

diff --git a/drivers/video/fbdev/omap2/omapfb/dss/video-pll.c b/drivers/video/fbdev/omap2/omapfb/dss/video-pll.c
index f45fe60..ca430ca 100644 (file)
--- a/drivers/video/fbdev/omap2/omapfb/dss/video-pll.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/video-pll.c
@@ -129,7 +129,6 @@ struct dss_pll *dss_video_pll_init(struct platform_device *pdev, int id,
        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;
@@ -138,14 +137,7 @@ struct dss_pll *dss_video_pll_init(struct platform_device *pdev, int id,
 
        /* PLL CONTROL */
 
-       res = platform_get_resource_byname(pdev, IORESOURCE_MEM, reg_name[id]);
-       if (!res) {
-               dev_err(&pdev->dev,
-                       "missing platform resource data for pll%d\n", id);
-               return ERR_PTR(-ENODEV);
-       }
-
-       pll_base = devm_ioremap_resource(&pdev->dev, res);
+       pll_base = devm_platform_ioremap_resource_byname(pdev, reg_name[id]);
        if (IS_ERR(pll_base)) {
                dev_err(&pdev->dev, "failed to ioremap pll%d reg_name\n", id);
                return ERR_CAST(pll_base);
@@ -153,15 +145,7 @@ struct dss_pll *dss_video_pll_init(struct platform_device *pdev, int id,
 
        /* CLOCK CONTROL */
 
-       res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
-               clkctrl_name[id]);
-       if (!res) {
-               dev_err(&pdev->dev,
-                       "missing platform resource data for pll%d\n", id);
-               return ERR_PTR(-ENODEV);
-       }
-
-       clkctrl_base = devm_ioremap_resource(&pdev->dev, res);
+       clkctrl_base = devm_platform_ioremap_resource_byname(pdev, clkctrl_name[id]);
        if (IS_ERR(clkctrl_base)) {
                dev_err(&pdev->dev, "failed to ioremap pll%d clkctrl\n", id);
                return ERR_CAST(clkctrl_base);