Re: [Outreachy kernel] Re: [PATCH] drm/tinydrm: Replace dev_error with DRM_DEV_ERROR

From: Daniel Vetter
Date: Fri Sep 29 2017 - 03:27:02 EST


On Mon, Sep 25, 2017 at 06:21:19PM +0200, Noralf Trønnes wrote:
>
> Den 23.09.2017 11.10, 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@xxxxxxxxx>
> > ---
> > drivers/gpu/drm/tinydrm/mi0283qt.c | 8 ++++----
> > drivers/gpu/drm/tinydrm/repaper.c | 26 +++++++++++++-------------
> > drivers/gpu/drm/tinydrm/st7586.c | 6 +++---
> > 3 files changed, 20 insertions(+), 20 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/tinydrm/mi0283qt.c b/drivers/gpu/drm/tinydrm/mi0283qt.c
> > index 7e5bb7d..7dded50 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 30dc97b..bd152bb 100644
> > --- a/drivers/gpu/drm/tinydrm/repaper.c
> > +++ b/drivers/gpu/drm/tinydrm/repaper.c
> > @@ -473,7 +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",
> > + DRM_DEV_ERROR(&epd->spi->dev, "Failed to get temperature (%d)\n",
> > ret);
>
> Please fix these alignment issues, or maybe just put it all on one line:
>
> CHECK: Alignment should match open parenthesis
> #59: FILE: drivers/gpu/drm/tinydrm/repaper.c:477:
> +               DRM_DEV_ERROR(&epd->spi->dev, "Failed to get temperature
> (%d)\n",
>                         ret);
>
> CHECK: Alignment should match open parenthesis
> #152: FILE: drivers/gpu/drm/tinydrm/repaper.c:995:
> +                       DRM_DEV_ERROR(dev, "Failed to get thermal zone:
> %s\n",
>                                 thermal_zone);
>
> With that changed you can add to your next version:
> Reviewed-by: Noralf Trønnes <noralf@xxxxxxxxxxx>

I couldn't find v2 of this one here ...
-Daniel

>
> > return;
> > }
> > @@ -629,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;
> > @@ -703,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;
> > }
> > @@ -725,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;
> > }
> > @@ -767,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;
> > }
> > @@ -779,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;
> > }
> > @@ -959,7 +959,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 +967,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 +975,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 +983,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,7 +991,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",
> > + DRM_DEV_ERROR(dev, "Failed to get thermal zone: %s\n",
> > thermal_zone);
> > return PTR_ERR(epd->thermal);
> > }
> > @@ -1033,7 +1033,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 b439956..14361a5 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);
> > }
>
> --
> You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to outreachy-kernel+unsubscribe@xxxxxxxxxxxxxxxxx
> To post to this group, send email to outreachy-kernel@xxxxxxxxxxxxxxxxx
> To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/cdccf6a3-8c66-89e5-be4f-a03e64591dbe%40tronnes.org.
> For more options, visit https://groups.google.com/d/optout.

--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch