Skip to content

Commit

Permalink
drm/tinydrm: Replace dev_error with DRM_DEV_ERROR
Browse files Browse the repository at this point in the history 
Convert instances of dev_error to DRM_DEV_ERROR as we have
DRM_DEV_ERROR variants of drm print macros.

Signed-off-by: Harsha Sharma <harshasharmaiitr@gmail.com>
Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20171006221738.30200-1-harshasharmaiitr@gmail.com
  • Loading branch information
Harsha Sharma authored and Noralf Trønnes committed Oct 13, 2017
1 parent 512721a commit e43e818
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 22 deletions.
8 changes: 4 additions & 4 deletions drivers/gpu/drm/tinydrm/mi0283qt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ static int mi0283qt_init(struct mipi_dbi *mipi)

ret = regulator_enable(mipi->regulator);
if (ret) {
dev_err(dev, "Failed to enable regulator %d\n", ret);
DRM_DEV_ERROR(dev, "Failed to enable regulator %d\n", ret);
return ret;
}

Expand All @@ -42,7 +42,7 @@ static int mi0283qt_init(struct mipi_dbi *mipi)
mipi_dbi_hw_reset(mipi);
ret = mipi_dbi_command(mipi, MIPI_DCS_SOFT_RESET);
if (ret) {
dev_err(dev, "Error sending command %d\n", ret);
DRM_DEV_ERROR(dev, "Error sending command %d\n", ret);
regulator_disable(mipi->regulator);
return ret;
}
Expand Down Expand Up @@ -174,13 +174,13 @@ static int mi0283qt_probe(struct spi_device *spi)

mipi->reset = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_HIGH);
if (IS_ERR(mipi->reset)) {
dev_err(dev, "Failed to get gpio 'reset'\n");
DRM_DEV_ERROR(dev, "Failed to get gpio 'reset'\n");
return PTR_ERR(mipi->reset);
}

dc = devm_gpiod_get_optional(dev, "dc", GPIOD_OUT_LOW);
if (IS_ERR(dc)) {
dev_err(dev, "Failed to get gpio 'dc'\n");
DRM_DEV_ERROR(dev, "Failed to get gpio 'dc'\n");
return PTR_ERR(dc);
}

Expand Down
28 changes: 13 additions & 15 deletions drivers/gpu/drm/tinydrm/repaper.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -474,8 +474,7 @@ static void repaper_get_temperature(struct repaper_epd *epd)

ret = thermal_zone_get_temp(epd->thermal, &temperature);
if (ret) {
dev_err(&epd->spi->dev, "Failed to get temperature (%d)\n",
ret);
DRM_DEV_ERROR(&epd->spi->dev, "Failed to get temperature (%d)\n", ret);
return;
}

Expand Down Expand Up @@ -630,7 +629,7 @@ static int repaper_fb_dirty(struct drm_framebuffer *fb,
mutex_unlock(&tdev->dirty_lock);

if (ret)
dev_err(fb->dev->dev, "Failed to update display (%d)\n", ret);
DRM_DEV_ERROR(fb->dev->dev, "Failed to update display (%d)\n", ret);
kfree(buf);

return ret;
Expand Down Expand Up @@ -704,7 +703,7 @@ static void repaper_pipe_enable(struct drm_simple_display_pipe *pipe,
}

if (!i) {
dev_err(dev, "timeout waiting for panel to become ready.\n");
DRM_DEV_ERROR(dev, "timeout waiting for panel to become ready.\n");
power_off(epd);
return;
}
Expand All @@ -726,9 +725,9 @@ static void repaper_pipe_enable(struct drm_simple_display_pipe *pipe,
ret = repaper_read_val(spi, 0x0f);
if (ret < 0 || !(ret & 0x80)) {
if (ret < 0)
dev_err(dev, "failed to read chip (%d)\n", ret);
DRM_DEV_ERROR(dev, "failed to read chip (%d)\n", ret);
else
dev_err(dev, "panel is reported broken\n");
DRM_DEV_ERROR(dev, "panel is reported broken\n");
power_off(epd);
return;
}
Expand Down Expand Up @@ -768,7 +767,7 @@ static void repaper_pipe_enable(struct drm_simple_display_pipe *pipe,
/* check DC/DC */
ret = repaper_read_val(spi, 0x0f);
if (ret < 0) {
dev_err(dev, "failed to read chip (%d)\n", ret);
DRM_DEV_ERROR(dev, "failed to read chip (%d)\n", ret);
power_off(epd);
return;
}
Expand All @@ -780,7 +779,7 @@ static void repaper_pipe_enable(struct drm_simple_display_pipe *pipe,
}

if (!dc_ok) {
dev_err(dev, "dc/dc failed\n");
DRM_DEV_ERROR(dev, "dc/dc failed\n");
power_off(epd);
return;
}
Expand Down Expand Up @@ -960,40 +959,39 @@ static int repaper_probe(struct spi_device *spi)
if (IS_ERR(epd->panel_on)) {
ret = PTR_ERR(epd->panel_on);
if (ret != -EPROBE_DEFER)
dev_err(dev, "Failed to get gpio 'panel-on'\n");
DRM_DEV_ERROR(dev, "Failed to get gpio 'panel-on'\n");
return ret;
}

epd->discharge = devm_gpiod_get(dev, "discharge", GPIOD_OUT_LOW);
if (IS_ERR(epd->discharge)) {
ret = PTR_ERR(epd->discharge);
if (ret != -EPROBE_DEFER)
dev_err(dev, "Failed to get gpio 'discharge'\n");
DRM_DEV_ERROR(dev, "Failed to get gpio 'discharge'\n");
return ret;
}

epd->reset = devm_gpiod_get(dev, "reset", GPIOD_OUT_LOW);
if (IS_ERR(epd->reset)) {
ret = PTR_ERR(epd->reset);
if (ret != -EPROBE_DEFER)
dev_err(dev, "Failed to get gpio 'reset'\n");
DRM_DEV_ERROR(dev, "Failed to get gpio 'reset'\n");
return ret;
}

epd->busy = devm_gpiod_get(dev, "busy", GPIOD_IN);
if (IS_ERR(epd->busy)) {
ret = PTR_ERR(epd->busy);
if (ret != -EPROBE_DEFER)
dev_err(dev, "Failed to get gpio 'busy'\n");
DRM_DEV_ERROR(dev, "Failed to get gpio 'busy'\n");
return ret;
}

if (!device_property_read_string(dev, "pervasive,thermal-zone",
&thermal_zone)) {
epd->thermal = thermal_zone_get_zone_by_name(thermal_zone);
if (IS_ERR(epd->thermal)) {
dev_err(dev, "Failed to get thermal zone: %s\n",
thermal_zone);
DRM_DEV_ERROR(dev, "Failed to get thermal zone: %s\n", thermal_zone);
return PTR_ERR(epd->thermal);
}
}
Expand Down Expand Up @@ -1034,7 +1032,7 @@ static int repaper_probe(struct spi_device *spi)
if (IS_ERR(epd->border)) {
ret = PTR_ERR(epd->border);
if (ret != -EPROBE_DEFER)
dev_err(dev, "Failed to get gpio 'border'\n");
DRM_DEV_ERROR(dev, "Failed to get gpio 'border'\n");
return ret;
}

Expand Down
6 changes: 3 additions & 3 deletions drivers/gpu/drm/tinydrm/st7586.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ static void st7586_pipe_enable(struct drm_simple_display_pipe *pipe,
mipi_dbi_hw_reset(mipi);
ret = mipi_dbi_command(mipi, ST7586_AUTO_READ_CTRL, 0x9f);
if (ret) {
dev_err(dev, "Error sending command %d\n", ret);
DRM_DEV_ERROR(dev, "Error sending command %d\n", ret);
return;
}

Expand Down Expand Up @@ -355,13 +355,13 @@ static int st7586_probe(struct spi_device *spi)

mipi->reset = devm_gpiod_get(dev, "reset", GPIOD_OUT_HIGH);
if (IS_ERR(mipi->reset)) {
dev_err(dev, "Failed to get gpio 'reset'\n");
DRM_DEV_ERROR(dev, "Failed to get gpio 'reset'\n");
return PTR_ERR(mipi->reset);
}

a0 = devm_gpiod_get(dev, "a0", GPIOD_OUT_LOW);
if (IS_ERR(a0)) {
dev_err(dev, "Failed to get gpio 'a0'\n");
DRM_DEV_ERROR(dev, "Failed to get gpio 'a0'\n");
return PTR_ERR(a0);
}

Expand Down

0 comments on commit e43e818

Please sign in to comment.