[PATCH -next v2 3/3] drm/rockchip: Simplified with dev_err_probe()

[Jinjie Ruan]

Use dev_err_probe to replace deprecated() DRM_DEV_ERROR(), which
can simplfy code.

Signed-off-by: Jinjie Ruan <ruanjin...@huawei.com>
---
 drivers/gpu/drm/rockchip/rockchip_lvds.c | 30 +++++++++---------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/drivers/gpu/drm/rockchip/rockchip_lvds.c 
b/drivers/gpu/drm/rockchip/rockchip_lvds.c
index 700ac730887d..92679e54c71d 100644
--- a/drivers/gpu/drm/rockchip/rockchip_lvds.c
+++ b/drivers/gpu/drm/rockchip/rockchip_lvds.c
@@ -455,10 +455,8 @@ static int rk3288_lvds_probe(struct platform_device *pdev,
                return PTR_ERR(lvds->regs);
 
        lvds->pclk = devm_clk_get(lvds->dev, "pclk_lvds");
-       if (IS_ERR(lvds->pclk)) {
-               DRM_DEV_ERROR(lvds->dev, "could not get pclk_lvds\n");
-               return PTR_ERR(lvds->pclk);
-       }
+       if (IS_ERR(lvds->pclk))
+               return dev_err_probe(lvds->dev, PTR_ERR(lvds->pclk), "could not 
get pclk_lvds\n");
 
        lvds->pins = devm_kzalloc(lvds->dev, sizeof(*lvds->pins),
                                  GFP_KERNEL);
@@ -467,24 +465,22 @@ static int rk3288_lvds_probe(struct platform_device *pdev,
 
        lvds->pins->p = devm_pinctrl_get(lvds->dev);
        if (IS_ERR(lvds->pins->p)) {
-               DRM_DEV_ERROR(lvds->dev, "no pinctrl handle\n");
+               dev_err(lvds->dev, "no pinctrl handle\n");
                devm_kfree(lvds->dev, lvds->pins);
                lvds->pins = NULL;
        } else {
                lvds->pins->default_state =
                        pinctrl_lookup_state(lvds->pins->p, "lcdc");
                if (IS_ERR(lvds->pins->default_state)) {
-                       DRM_DEV_ERROR(lvds->dev, "no default pinctrl state\n");
+                       dev_err(lvds->dev, "no default pinctrl state\n");
                        devm_kfree(lvds->dev, lvds->pins);
                        lvds->pins = NULL;
                }
        }
 
        ret = clk_prepare(lvds->pclk);
-       if (ret < 0) {
-               DRM_DEV_ERROR(lvds->dev, "failed to prepare pclk_lvds\n");
-               return ret;
-       }
+       if (ret < 0)
+               return dev_err_probe(lvds->dev, ret, "failed to prepare 
pclk_lvds\n");
 
        return 0;
 }
@@ -700,22 +696,18 @@ static int rockchip_lvds_probe(struct platform_device 
*pdev)
 
        lvds->grf = syscon_regmap_lookup_by_phandle(dev->of_node,
                                                    "rockchip,grf");
-       if (IS_ERR(lvds->grf)) {
-               DRM_DEV_ERROR(dev, "missing rockchip,grf property\n");
-               return PTR_ERR(lvds->grf);
-       }
+       if (IS_ERR(lvds->grf))
+               return dev_err_probe(dev, PTR_ERR(lvds->grf), "missing 
rockchip,grf property\n");
 
        ret = lvds->soc_data->probe(pdev, lvds);
-       if (ret) {
-               DRM_DEV_ERROR(dev, "Platform initialization failed\n");
-               return ret;
-       }
+       if (ret)
+               return dev_err_probe(dev, ret, "Platform initialization 
failed\n");
 
        dev_set_drvdata(dev, lvds);
 
        ret = component_add(&pdev->dev, &rockchip_lvds_component_ops);
        if (ret < 0) {
-               DRM_DEV_ERROR(dev, "failed to add component\n");
+               dev_err(dev, "failed to add component\n");
                clk_unprepare(lvds->pclk);
        }
 
-- 
2.34.1