diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2020-09-06 15:29:03 +0200 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2020-09-06 21:55:03 +0200 |
| commit | d2024cdf0f02b9bdad2adb8ce220e30c6424e247 (patch) | |
| tree | f33982d7592453d6f70c2d1faf091e392e0881d0 /drivers/gpu/drm/panel/panel-samsung-s6e63m0-dsi.c | |
| parent | ec219f1ba23777c84e913b08e192413eea22d220 (diff) | |
| download | lwn-d2024cdf0f02b9bdad2adb8ce220e30c6424e247.tar.gz lwn-d2024cdf0f02b9bdad2adb8ce220e30c6424e247.zip | |
drm/panel: s6e63m0: Fix up DRM_DEV* regression
Ooops the panel drivers stopped to use DRM_DEV* messages
and we predictably create errors by merging code that
still use it.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Acked-by: David Airlie <airlied@linux.ie>
Link: https://patchwork.freedesktop.org/patch/msgid/20200906132903.5739-1-linus.walleij@linaro.org
Diffstat (limited to 'drivers/gpu/drm/panel/panel-samsung-s6e63m0-dsi.c')
| -rw-r--r-- | drivers/gpu/drm/panel/panel-samsung-s6e63m0-dsi.c | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/drivers/gpu/drm/panel/panel-samsung-s6e63m0-dsi.c b/drivers/gpu/drm/panel/panel-samsung-s6e63m0-dsi.c index 2ec9e7900791..eec74c10ddda 100644 --- a/drivers/gpu/drm/panel/panel-samsung-s6e63m0-dsi.c +++ b/drivers/gpu/drm/panel/panel-samsung-s6e63m0-dsi.c @@ -23,11 +23,11 @@ static int s6e63m0_dsi_dcs_read(struct device *dev, const u8 cmd, u8 *data) ret = mipi_dsi_dcs_read(dsi, cmd, data, 1); if (ret < 0) { - DRM_DEV_ERROR(dev, "could not read DCS CMD %02x\n", cmd); + dev_err(dev, "could not read DCS CMD %02x\n", cmd); return ret; } - DRM_DEV_INFO(dev, "DSI read CMD %02x = %02x\n", cmd, *data); + dev_info(dev, "DSI read CMD %02x = %02x\n", cmd, *data); return 0; } @@ -42,7 +42,7 @@ static int s6e63m0_dsi_dcs_write(struct device *dev, const u8 *data, size_t len) int chunk; int ret; - DRM_DEV_INFO(dev, "DSI writing dcs seq: %*ph\n", (int)len, data); + dev_info(dev, "DSI writing dcs seq: %*ph\n", (int)len, data); /* Pick out and skip past the DCS command */ cmd = *seqp; @@ -56,9 +56,7 @@ static int s6e63m0_dsi_dcs_write(struct device *dev, const u8 *data, size_t len) chunk = S6E63M0_DSI_MAX_CHUNK; ret = mipi_dsi_dcs_write(dsi, cmd, seqp, chunk); if (ret < 0) { - DRM_DEV_ERROR(dev, - "error sending DCS command seq cmd %02x\n", - cmd); + dev_err(dev, "error sending DCS command seq cmd %02x\n", cmd); return ret; } cmdwritten += chunk; @@ -70,23 +68,19 @@ static int s6e63m0_dsi_dcs_write(struct device *dev, const u8 *data, size_t len) chunk = S6E63M0_DSI_MAX_CHUNK; ret = mipi_dsi_dcs_write(dsi, MCS_GLOBAL_PARAM, &cmdwritten, 1); if (ret < 0) { - DRM_DEV_ERROR(dev, - "error sending CMD %02x global param %02x\n", - cmd, cmdwritten); + dev_err(dev, "error sending CMD %02x global param %02x\n", + cmd, cmdwritten); return ret; } ret = mipi_dsi_dcs_write(dsi, cmd, seqp, chunk); if (ret < 0) { - DRM_DEV_ERROR(dev, - "error sending CMD %02x chunk\n", - cmd); + dev_err(dev, "error sending CMD %02x chunk\n", cmd); return ret; } cmdwritten += chunk; seqp += chunk; } - DRM_DEV_INFO(dev, "sent command %02x %02x bytes\n", - cmd, cmdwritten); + dev_info(dev, "sent command %02x %02x bytes\n", cmd, cmdwritten); usleep_range(8000, 9000); |