Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f83d208 authored by Inki Dae's avatar Inki Dae
Browse files

drm/exynos: use DRM_DEV_ERROR to print out error message 



This patch just cleans up the use of error log macro, which changes
the log macro to DRM_DEV_ERROR.

Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
parent 62f28738

drivers/gpu/drm/exynos/exynos5433_drm_decon.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -188,7 +188,7 @@ static void decon_setup_trigger(struct decon_context *ctx) 




	if (regmap_update_bits(ctx->sysreg, DSD_CFG_MUX,

	if (regmap_update_bits(ctx->sysreg, DSD_CFG_MUX,

			       DSD_CFG_MUX_TE_UNMASK_GLOBAL, ~0))

			       DSD_CFG_MUX_TE_UNMASK_GLOBAL, ~0))

		DRM_ERROR("Cannot update sysreg.\n");

		DRM_DEV_ERROR(ctx->dev, "Cannot update sysreg.\n");

}

}





static void decon_commit(struct exynos_drm_crtc *crtc)

static void decon_commit(struct exynos_drm_crtc *crtc)

drivers/gpu/drm/exynos/exynos7_drm_decon.c

+9 −5
Original line number Original line Diff line number Diff line
@@ -620,7 +620,7 @@ static int decon_bind(struct device *dev, struct device *master, void *data) 




	ret = decon_ctx_initialize(ctx, drm_dev);

	ret = decon_ctx_initialize(ctx, drm_dev);

	if (ret) {

	if (ret) {

		DRM_ERROR("decon_ctx_initialize failed.\n");

		DRM_DEV_ERROR(dev, "decon_ctx_initialize failed.\n");

		return ret;

		return ret;

	}

	}
@@ -800,25 +800,29 @@ static int exynos7_decon_resume(struct device *dev) 




	ret = clk_prepare_enable(ctx->pclk);

	ret = clk_prepare_enable(ctx->pclk);

	if (ret < 0) {

	if (ret < 0) {

		DRM_ERROR("Failed to prepare_enable the pclk [%d]\n", ret);

		DRM_DEV_ERROR(dev, "Failed to prepare_enable the pclk [%d]\n",

			      ret);

		return ret;

		return ret;

	}

	}





	ret = clk_prepare_enable(ctx->aclk);

	ret = clk_prepare_enable(ctx->aclk);

	if (ret < 0) {

	if (ret < 0) {

		DRM_ERROR("Failed to prepare_enable the aclk [%d]\n", ret);

		DRM_DEV_ERROR(dev, "Failed to prepare_enable the aclk [%d]\n",

			      ret);

		return ret;

		return ret;

	}

	}





	ret = clk_prepare_enable(ctx->eclk);

	ret = clk_prepare_enable(ctx->eclk);

	if  (ret < 0) {

	if  (ret < 0) {

		DRM_ERROR("Failed to prepare_enable the eclk [%d]\n", ret);

		DRM_DEV_ERROR(dev, "Failed to prepare_enable the eclk [%d]\n",

			      ret);

		return ret;

		return ret;

	}

	}





	ret = clk_prepare_enable(ctx->vclk);

	ret = clk_prepare_enable(ctx->vclk);

	if  (ret < 0) {

	if  (ret < 0) {

		DRM_ERROR("Failed to prepare_enable the vclk [%d]\n", ret);

		DRM_DEV_ERROR(dev, "Failed to prepare_enable the vclk [%d]\n",

			      ret);

		return ret;

		return ret;

	}

	}

drivers/gpu/drm/exynos/exynos_dp.c

+6 −3
Original line number Original line Diff line number Diff line
@@ -83,7 +83,8 @@ static int exynos_dp_get_modes(struct analogix_dp_plat_data *plat_data, 




	mode = drm_mode_create(connector->dev);

	mode = drm_mode_create(connector->dev);

	if (!mode) {

	if (!mode) {

		DRM_ERROR("failed to create a new display mode.\n");

		DRM_DEV_ERROR(dp->dev,

			      "failed to create a new display mode.\n");

		return num_modes;

		return num_modes;

	}

	}
@@ -111,7 +112,8 @@ static int exynos_dp_bridge_attach(struct analogix_dp_plat_data *plat_data, 
	if (dp->ptn_bridge) {

	if (dp->ptn_bridge) {

		ret = drm_bridge_attach(&dp->encoder, dp->ptn_bridge, bridge);

		ret = drm_bridge_attach(&dp->encoder, dp->ptn_bridge, bridge);

		if (ret) {

		if (ret) {

			DRM_ERROR("Failed to attach bridge to drm\n");

			DRM_DEV_ERROR(dp->dev,

				      "Failed to attach bridge to drm\n");

			bridge->next = NULL;

			bridge->next = NULL;

			return ret;

			return ret;

		}

		}
@@ -147,7 +149,8 @@ static int exynos_dp_dt_parse_panel(struct exynos_dp_device *dp) 




	ret = of_get_videomode(dp->dev->of_node, &dp->vm, OF_USE_NATIVE_MODE);

	ret = of_get_videomode(dp->dev->of_node, &dp->vm, OF_USE_NATIVE_MODE);

	if (ret) {

	if (ret) {

		DRM_ERROR("failed: of_get_videomode() : %d\n", ret);

		DRM_DEV_ERROR(dp->dev,

			      "failed: of_get_videomode() : %d\n", ret);

		return ret;

		return ret;

	}

	}

	return 0;

	return 0;

drivers/gpu/drm/exynos/exynos_drm_dma.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -62,7 +62,7 @@ static int drm_iommu_attach_device(struct drm_device *drm_dev, 
	int ret;

	int ret;





	if (get_dma_ops(priv->dma_dev) != get_dma_ops(subdrv_dev)) {

	if (get_dma_ops(priv->dma_dev) != get_dma_ops(subdrv_dev)) {

		DRM_ERROR("Device %s lacks support for IOMMU\n",

		DRM_DEV_ERROR(subdrv_dev, "Device %s lacks support for IOMMU\n",

			  dev_name(subdrv_dev));

			  dev_name(subdrv_dev));

		return -EINVAL;

		return -EINVAL;

	}

	}

drivers/gpu/drm/exynos/exynos_drm_dpi.c

+6 −3
Original line number Original line Diff line number Diff line
@@ -77,7 +77,8 @@ static int exynos_dpi_get_modes(struct drm_connector *connector) 




		mode = drm_mode_create(connector->dev);

		mode = drm_mode_create(connector->dev);

		if (!mode) {

		if (!mode) {

			DRM_ERROR("failed to create a new display mode\n");

			DRM_DEV_ERROR(ctx->dev,

				      "failed to create a new display mode\n");

			return 0;

			return 0;

		}

		}

		drm_display_mode_from_videomode(ctx->vm, mode);

		drm_display_mode_from_videomode(ctx->vm, mode);
@@ -108,7 +109,8 @@ static int exynos_dpi_create_connector(struct drm_encoder *encoder) 
				 &exynos_dpi_connector_funcs,

				 &exynos_dpi_connector_funcs,

				 DRM_MODE_CONNECTOR_VGA);

				 DRM_MODE_CONNECTOR_VGA);

	if (ret) {

	if (ret) {

		DRM_ERROR("failed to initialize connector with drm\n");

		DRM_DEV_ERROR(ctx->dev,

			      "failed to initialize connector with drm\n");

		return ret;

		return ret;

	}

	}
@@ -213,7 +215,8 @@ int exynos_dpi_bind(struct drm_device *dev, struct drm_encoder *encoder) 




	ret = exynos_dpi_create_connector(encoder);

	ret = exynos_dpi_create_connector(encoder);

	if (ret) {

	if (ret) {

		DRM_ERROR("failed to create connector ret = %d\n", ret);

		DRM_DEV_ERROR(encoder_to_dpi(encoder)->dev,

			      "failed to create connector ret = %d\n", ret);

		drm_encoder_cleanup(encoder);

		drm_encoder_cleanup(encoder);

		return ret;

		return ret;

	}

	}