Commit 1b8f576c authored by Cristian Ciocaltea's avatar Cristian Ciocaltea Committed by Heiko Stuebner
Browse files

drm/rockchip: dw_hdmi: Use modern drm_device based logging 



Prefer drm_{err|info|dbg}() over deprecated DRM_DEV_{ERROR|INFO|DEBUG}()
logging macros.

Conversion done with the help of the following semantic patch, followed
by a few minor indentation adjustments:

@@
identifier T;
@@

(
-DRM_DEV_ERROR(T->dev,
+drm_err(T,
...)
|
-DRM_DEV_INFO(T->dev,
+drm_info(T,
...)
|
-DRM_DEV_DEBUG(T->dev,
+drm_dbg(T,
...)
)

Signed-off-by: default avatarCristian Ciocaltea <cristian.ciocaltea@collabora.com>
Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20240813-dw-hdmi-rockchip-cleanup-v1-1-b3e73b5f4fd6@collabora.com
parent 6ed51ba9

drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c

+11 −13
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ static int rockchip_hdmi_parse_dt(struct rockchip_hdmi *hdmi) 


	hdmi->regmap = syscon_regmap_lookup_by_phandle(np, "rockchip,grf");

	if (IS_ERR(hdmi->regmap)) {

		DRM_DEV_ERROR(hdmi->dev, "Unable to get rockchip,grf\n");

		drm_err(hdmi, "Unable to get rockchip,grf\n");

		return PTR_ERR(hdmi->regmap);

	}
@@ -223,7 +223,7 @@ static int rockchip_hdmi_parse_dt(struct rockchip_hdmi *hdmi) 
	if (PTR_ERR(hdmi->ref_clk) == -EPROBE_DEFER) {

		return -EPROBE_DEFER;

	} else if (IS_ERR(hdmi->ref_clk)) {

		DRM_DEV_ERROR(hdmi->dev, "failed to get reference clock\n");

		drm_err(hdmi, "failed to get reference clock\n");

		return PTR_ERR(hdmi->ref_clk);

	}
@@ -233,7 +233,7 @@ static int rockchip_hdmi_parse_dt(struct rockchip_hdmi *hdmi) 
	} else if (PTR_ERR(hdmi->grf_clk) == -EPROBE_DEFER) {

		return -EPROBE_DEFER;

	} else if (IS_ERR(hdmi->grf_clk)) {

		DRM_DEV_ERROR(hdmi->dev, "failed to get grf clock\n");

		drm_err(hdmi, "failed to get grf clock\n");

		return PTR_ERR(hdmi->grf_clk);

	}
@@ -322,17 +322,16 @@ static void dw_hdmi_rockchip_encoder_enable(struct drm_encoder *encoder) 


	ret = clk_prepare_enable(hdmi->grf_clk);

	if (ret < 0) {

		DRM_DEV_ERROR(hdmi->dev, "failed to enable grfclk %d\n", ret);

		drm_err(hdmi, "failed to enable grfclk %d\n", ret);

		return;

	}



	ret = regmap_write(hdmi->regmap, hdmi->chip_data->lcdsel_grf_reg, val);

	if (ret != 0)

		DRM_DEV_ERROR(hdmi->dev, "Could not write to GRF: %d\n", ret);

		drm_err(hdmi, "Could not write to GRF: %d\n", ret);



	clk_disable_unprepare(hdmi->grf_clk);

	DRM_DEV_DEBUG(hdmi->dev, "vop %s output to hdmi\n",

		      ret ? "LIT" : "BIG");

	drm_dbg(hdmi, "vop %s output to hdmi\n", ret ? "LIT" : "BIG");

}



static int
@@ -592,7 +591,7 @@ static int dw_hdmi_rockchip_bind(struct device *dev, struct device *master, 
	ret = rockchip_hdmi_parse_dt(hdmi);

	if (ret) {

		if (ret != -EPROBE_DEFER)

			DRM_DEV_ERROR(hdmi->dev, "Unable to parse OF data\n");

			drm_err(hdmi, "Unable to parse OF data\n");

		return ret;

	}
@@ -600,26 +599,25 @@ static int dw_hdmi_rockchip_bind(struct device *dev, struct device *master, 
	if (IS_ERR(hdmi->phy)) {

		ret = PTR_ERR(hdmi->phy);

		if (ret != -EPROBE_DEFER)

			DRM_DEV_ERROR(hdmi->dev, "failed to get phy\n");

			drm_err(hdmi, "failed to get phy\n");

		return ret;

	}



	ret = regulator_enable(hdmi->avdd_0v9);

	if (ret) {

		DRM_DEV_ERROR(hdmi->dev, "failed to enable avdd0v9: %d\n", ret);

		drm_err(hdmi, "failed to enable avdd0v9: %d\n", ret);

		goto err_avdd_0v9;

	}



	ret = regulator_enable(hdmi->avdd_1v8);

	if (ret) {

		DRM_DEV_ERROR(hdmi->dev, "failed to enable avdd1v8: %d\n", ret);

		drm_err(hdmi, "failed to enable avdd1v8: %d\n", ret);

		goto err_avdd_1v8;

	}



	ret = clk_prepare_enable(hdmi->ref_clk);

	if (ret) {

		DRM_DEV_ERROR(hdmi->dev, "Failed to enable HDMI reference clock: %d\n",

			      ret);

		drm_err(hdmi, "Failed to enable HDMI reference clock: %d\n", ret);

		goto err_clk;

	}