diff mbox

[v3] drm/tinydrm: Replace dev_error with DRM_DEV_ERROR

Message ID 20171006221738.30200-1-harshasharmaiitr@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

harsha sharma Oct. 6, 2017, 10:17 p.m. UTC 
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>
---
Changes in v3:
 -Solve merge conflicts
Changes in v2:
 -Fix alignment issues
 drivers/gpu/drm/tinydrm/mi0283qt.c |  8 ++++----
 drivers/gpu/drm/tinydrm/repaper.c  | 28 +++++++++++++---------------
 drivers/gpu/drm/tinydrm/st7586.c   |  6 +++---
 3 files changed, 20 insertions(+), 22 deletions(-)

Comments

Noralf Trønnes Oct. 13, 2017, 3:44 p.m. UTC | #1 
Den 07.10.2017 00.17, skrev Harsha Sharma:
> 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>
> ---

Thanks, applied to drm-misc.

Noralf.

> Changes in v3:
>   -Solve merge conflicts
> Changes in v2:
>   -Fix alignment issues
>   drivers/gpu/drm/tinydrm/mi0283qt.c |  8 ++++----
>   drivers/gpu/drm/tinydrm/repaper.c  | 28 +++++++++++++---------------
>   drivers/gpu/drm/tinydrm/st7586.c   |  6 +++---
>   3 files changed, 20 insertions(+), 22 deletions(-)
>
> diff --git a/drivers/gpu/drm/tinydrm/mi0283qt.c b/drivers/gpu/drm/tinydrm/mi0283qt.c
> index 7e5bb7d6f655..7dded506ba8c 100644
> --- a/drivers/gpu/drm/tinydrm/mi0283qt.c
> +++ b/drivers/gpu/drm/tinydrm/mi0283qt.c
> @@ -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;
>   	}
>   
> @@ -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;
>   	}
> @@ -175,13 +175,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);
>   	}
>   
> diff --git a/drivers/gpu/drm/tinydrm/repaper.c b/drivers/gpu/drm/tinydrm/repaper.c
> index 30dc97b3ff21..028d428d4ab9 100644
> --- a/drivers/gpu/drm/tinydrm/repaper.c
> +++ b/drivers/gpu/drm/tinydrm/repaper.c
> @@ -473,8 +473,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;
>   	}
>   
> @@ -629,7 +628,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;
> @@ -703,7 +702,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;
>   	}
> @@ -725,9 +724,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;
>   	}
> @@ -767,7 +766,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;
>   		}
> @@ -779,7 +778,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;
>   	}
> @@ -959,7 +958,7 @@ 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;
>   	}
>   
> @@ -967,7 +966,7 @@ static int repaper_probe(struct spi_device *spi)
>   	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;
>   	}
>   
> @@ -975,7 +974,7 @@ static int repaper_probe(struct spi_device *spi)
>   	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;
>   	}
>   
> @@ -983,7 +982,7 @@ static int repaper_probe(struct spi_device *spi)
>   	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;
>   	}
>   
> @@ -991,8 +990,7 @@ static int repaper_probe(struct spi_device *spi)
>   					 &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);
>   		}
>   	}
> @@ -1033,7 +1031,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;
>   		}
>   
> diff --git a/drivers/gpu/drm/tinydrm/st7586.c b/drivers/gpu/drm/tinydrm/st7586.c
> index b439956a07f4..14361a5e9deb 100644
> --- a/drivers/gpu/drm/tinydrm/st7586.c
> +++ b/drivers/gpu/drm/tinydrm/st7586.c
> @@ -187,7 +187,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;
>   	}
>   
> @@ -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);
>   	}
>
diff mbox

Patch

diff --git a/drivers/gpu/drm/tinydrm/mi0283qt.c b/drivers/gpu/drm/tinydrm/mi0283qt.c
index 7e5bb7d6f655..7dded506ba8c 100644
--- a/drivers/gpu/drm/tinydrm/mi0283qt.c
+++ b/drivers/gpu/drm/tinydrm/mi0283qt.c
@@ -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;
 	}
 
@@ -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;
 	}
@@ -175,13 +175,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);
 	}
 
diff --git a/drivers/gpu/drm/tinydrm/repaper.c b/drivers/gpu/drm/tinydrm/repaper.c
index 30dc97b3ff21..028d428d4ab9 100644
--- a/drivers/gpu/drm/tinydrm/repaper.c
+++ b/drivers/gpu/drm/tinydrm/repaper.c
@@ -473,8 +473,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;
 	}
 
@@ -629,7 +628,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;
@@ -703,7 +702,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;
 	}
@@ -725,9 +724,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;
 	}
@@ -767,7 +766,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;
 		}
@@ -779,7 +778,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;
 	}
@@ -959,7 +958,7 @@  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;
 	}
 
@@ -967,7 +966,7 @@  static int repaper_probe(struct spi_device *spi)
 	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;
 	}
 
@@ -975,7 +974,7 @@  static int repaper_probe(struct spi_device *spi)
 	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;
 	}
 
@@ -983,7 +982,7 @@  static int repaper_probe(struct spi_device *spi)
 	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;
 	}
 
@@ -991,8 +990,7 @@  static int repaper_probe(struct spi_device *spi)
 					 &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);
 		}
 	}
@@ -1033,7 +1031,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;
 		}
 
diff --git a/drivers/gpu/drm/tinydrm/st7586.c b/drivers/gpu/drm/tinydrm/st7586.c
index b439956a07f4..14361a5e9deb 100644
--- a/drivers/gpu/drm/tinydrm/st7586.c
+++ b/drivers/gpu/drm/tinydrm/st7586.c
@@ -187,7 +187,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;
 	}
 
@@ -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);
 	}