For drivers which could have multiple instances, it is necessary to differentiate between which is which in the logs. Since DRM_INFO/WARN/ERROR don’t do this, drivers used dev_info/warn/err to make this differentiation. We now have DRM_DEV_* variants of the drm print macros, so we can start to convert those drivers back to using drm-formatted specific log messages. This patch is using following Coccinelle script: @@ @@ ( - dev_info + DRM_DEV_INFO | - dev_err + DRM_DEV_ERROR | - dev_dbg + DRM_DEV_DEBUG ) Signed-off-by: Aastha Gupta <aastha.gupta4104@xxxxxxxxx> --- drivers/gpu/drm/panel/panel-samsung-s6e8aa0.c | 28 +++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/panel/panel-samsung-s6e8aa0.c b/drivers/gpu/drm/panel/panel-samsung-s6e8aa0.c index a188a39..ec677e6 100644 --- a/drivers/gpu/drm/panel/panel-samsung-s6e8aa0.c +++ b/drivers/gpu/drm/panel/panel-samsung-s6e8aa0.c @@ -143,8 +143,9 @@ static void s6e8aa0_dcs_write(struct s6e8aa0 *ctx, const void *data, size_t len) ret = mipi_dsi_dcs_write_buffer(dsi, data, len); if (ret < 0) { - dev_err(ctx->dev, "error %zd writing dcs seq: %*ph\n", ret, - (int)len, data); + DRM_DEV_ERROR(ctx->dev, + "error %zd writing dcs seq: %*ph\n", ret, + (int)len, data); ctx->error = ret; } } @@ -159,7 +160,8 @@ static int s6e8aa0_dcs_read(struct s6e8aa0 *ctx, u8 cmd, void *data, size_t len) ret = mipi_dsi_dcs_read(dsi, cmd, data, len); if (ret < 0) { - dev_err(ctx->dev, "error %d reading dcs seq(%#x)\n", ret, cmd); + DRM_DEV_ERROR(ctx->dev, + "error %d reading dcs seq(%#x)\n", ret, cmd); ctx->error = ret; } @@ -810,9 +812,9 @@ static void s6e8aa0_set_maximum_return_packet_size(struct s6e8aa0 *ctx, ret = mipi_dsi_set_maximum_return_packet_size(dsi, size); if (ret < 0) { - dev_err(ctx->dev, - "error %d setting maximum return packet size to %d\n", - ret, size); + DRM_DEV_ERROR(ctx->dev, + "error %d setting maximum return packet size to %d\n", + ret, size); ctx->error = ret; } } @@ -824,19 +826,21 @@ static void s6e8aa0_read_mtp_id(struct s6e8aa0 *ctx) ret = s6e8aa0_dcs_read(ctx, 0xd1, id, ARRAY_SIZE(id)); if (ret < ARRAY_SIZE(id) || id[0] == 0x00) { - dev_err(ctx->dev, "read id failed\n"); + DRM_DEV_ERROR(ctx->dev, "read id failed\n"); ctx->error = -EIO; return; } - dev_info(ctx->dev, "ID: 0x%2x, 0x%2x, 0x%2x\n", id[0], id[1], id[2]); + DRM_DEV_INFO(ctx->dev, + "ID: 0x%2x, 0x%2x, 0x%2x\n", id[0], id[1], id[2]); for (i = 0; i < ARRAY_SIZE(s6e8aa0_variants); ++i) { if (id[1] == s6e8aa0_variants[i].version) break; } if (i >= ARRAY_SIZE(s6e8aa0_variants)) { - dev_err(ctx->dev, "unsupported display version %d\n", id[1]); + DRM_DEV_ERROR(ctx->dev, + "unsupported display version %d\n", id[1]); ctx->error = -EINVAL; return; } @@ -1003,14 +1007,14 @@ static int s6e8aa0_probe(struct mipi_dsi_device *dsi) ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(ctx->supplies), ctx->supplies); if (ret < 0) { - dev_err(dev, "failed to get regulators: %d\n", ret); + DRM_DEV_ERROR(dev, "failed to get regulators: %d\n", ret); return ret; } ctx->reset_gpio = devm_gpiod_get(dev, "reset", GPIOD_OUT_HIGH); if (IS_ERR(ctx->reset_gpio)) { - dev_err(dev, "cannot get reset-gpios %ld\n", - PTR_ERR(ctx->reset_gpio)); + DRM_DEV_ERROR(dev, "cannot get reset-gpios %ld\n", + PTR_ERR(ctx->reset_gpio)); return PTR_ERR(ctx->reset_gpio); } -- 2.7.4 _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel