[PATCH v1 03/19] drm/panel: samsung: use DRM_DEV*

Sam Ravnborg
2019-01-31T19:26:47Z

drivers/gpu/drm/panel/panel-samsung-ld9040.c | 12 +++++------
drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c | 15 +++++++-------
drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c | 8 ++++----
drivers/gpu/drm/panel/panel-samsung-s6e8aa0.c | 26 +++++++++++++-----------
4 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/drivers/gpu/drm/panel/panel-samsung-ld9040.c b/drivers/gpu/drm/panel/panel-samsung-ld9040.c
index 7d27b79d0b2a..fec639c19d74 100644
--- a/drivers/gpu/drm/panel/panel-samsung-ld9040.c
+++ b/drivers/gpu/drm/panel/panel-samsung-ld9040.c
@@ -149,7 +149,7 @@ static void ld9040_dcs_write(struct ld9040 *ctx, const u8 *data, size_t len)
if (ctx->error < 0 || len == 0)
return;

- dev_dbg(ctx->dev, "writing dcs seq: %*ph\n", (int)len, data);
+ DRM_DEV_DEBUG(ctx->dev, "writing dcs seq: %*ph\n", (int)len, data);
ret = ld9040_spi_write_word(ctx, *data);

while (!ret && --len) {
@@ -158,8 +158,8 @@ static void ld9040_dcs_write(struct ld9040 *ctx, const u8 *data, size_t len)
}

if (ret) {
- dev_err(ctx->dev, "error %d writing dcs seq: %*ph\n", ret,
- (int)len, data);
+ DRM_DEV_ERROR(ctx->dev, "error %d writing dcs seq: %*ph\n",
+ ret, (int)len, data);
ctx->error = ret;
}

@@ -342,15 +342,15 @@ static int ld9040_probe(struct spi_device *spi)

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);
}

spi->bits_per_word = 9;
ret = spi_setup(spi);
if (ret < 0) {
- dev_err(dev, "spi setup failed.\n");
+ DRM_DEV_ERROR(dev, "spi setup failed.\n");
return ret;
}

diff --git a/drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c b/drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c
index 813afee82ec9..e2f2ee252409 100644
--- a/drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c
+++ b/drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c
@@ -458,7 +458,8 @@ static int s6e3ha2_set_brightness(struct backlight_device *bl_dev)

if (brightness < S6E3HA2_MIN_BRIGHTNESS ||
brightness > bl_dev->props.max_brightness) {
- dev_err(ctx->dev, "Invalid brightness: %u\n", brightness);
+ DRM_DEV_ERROR(ctx->dev, "Invalid brightness: %u\n",
+ brightness);
return -EINVAL;
}

@@ -706,28 +707,28 @@ static int s6e3ha2_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_LOW);
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);
}

ctx->enable_gpio = devm_gpiod_get(dev, "enable", GPIOD_OUT_HIGH);
if (IS_ERR(ctx->enable_gpio)) {
- dev_err(dev, "cannot get enable-gpios %ld\n",
- PTR_ERR(ctx->enable_gpio));
+ DRM_DEV_ERROR(dev, "cannot get enable-gpios %ld\n",
+ PTR_ERR(ctx->enable_gpio));
return PTR_ERR(ctx->enable_gpio);
}

ctx->bl_dev = backlight_device_register("s6e3ha2", dev, ctx,
&s6e3ha2_bl_ops, NULL);
if (IS_ERR(ctx->bl_dev)) {
- dev_err(dev, "failed to register backlight device\n");
+ DRM_DEV_ERROR(dev, "failed to register backlight device\n");
return PTR_ERR(ctx->bl_dev);
}

diff --git a/drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c b/drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c
index f1c8000e0386..dd50f4089923 100644
--- a/drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c
+++ b/drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c
@@ -458,14 +458,14 @@ static int s6e63j0x03_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_LOW);
if (IS_ERR(ctx->reset_gpio)) {
- dev_err(dev, "cannot get reset-gpio: %ld\n",
- PTR_ERR(ctx->reset_gpio));
+ DRM_DEV_ERROR(dev, "cannot get reset-gpio: %ld\n",
+ PTR_ERR(ctx->reset_gpio));
return PTR_ERR(ctx->reset_gpio);
}

@@ -476,7 +476,7 @@ static int s6e63j0x03_probe(struct mipi_dsi_device *dsi)
ctx->bl_dev = backlight_device_register("s6e63j0x03", dev, ctx,
&s6e63j0x03_bl_ops, NULL);
if (IS_ERR(ctx->bl_dev)) {
- dev_err(dev, "failed to register backlight device\n");
+ DRM_DEV_ERROR(dev, "failed to register backlight device\n");
return PTR_ERR(ctx->bl_dev);
}

diff --git a/drivers/gpu/drm/panel/panel-samsung-s6e8aa0.c b/drivers/gpu/drm/panel/panel-samsung-s6e8aa0.c
index b252d23f386f..e3e0766c3a17 100644
--- a/drivers/gpu/drm/panel/panel-samsung-s6e8aa0.c
+++ b/drivers/gpu/drm/panel/panel-samsung-s6e8aa0.c
@@ -147,8 +147,8 @@ 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;
}
}
@@ -163,7 +163,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;
}

@@ -814,9 +815,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;
}
}
@@ -825,22 +826,23 @@ static void s6e8aa0_read_mtp_id(struct s6e8aa0 *ctx)
{
u8 id[3];
int ret, i;
+ struct device *dev = ctx->dev;

ret = s6e8aa0_dcs_read(ctx, 0xd1, id, ARRAY_SIZE(id));
if (ret < 0 || ret < ARRAY_SIZE(id) || id[0] == 0x00) {
- dev_err(ctx->dev, "read id failed\n");
+ DRM_DEV_ERROR(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(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(dev, "unsupported display version %d\n", id[1]);
ctx->error = -EINVAL;
return;
}
@@ -1007,14 +1009,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.12.0