Merge tag 'xfs-5.10-merge-7' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux

[linux-2.6-microblaze.git] / drivers / gpu / drm / panel / panel-orisetech-otm8009a.c

diff --git a/drivers/gpu/drm/panel/panel-orisetech-otm8009a.c b/drivers/gpu/drm/panel/panel-orisetech-otm8009a.c
index d956522..b6e377a 100644 (file)
--- a/drivers/gpu/drm/panel/panel-orisetech-otm8009a.c
+++ b/drivers/gpu/drm/panel/panel-orisetech-otm8009a.c
@@ -17,7 +17,6 @@
 #include <drm/drm_mipi_dsi.h>
 #include <drm/drm_modes.h>
 #include <drm/drm_panel.h>
-#include <drm/drm_print.h>
 
 #define OTM8009A_BACKLIGHT_DEFAULT     240
 #define OTM8009A_BACKLIGHT_MAX         255
@@ -97,7 +96,7 @@ static void otm8009a_dcs_write_buf(struct otm8009a *ctx, const void *data,
        struct mipi_dsi_device *dsi = to_mipi_dsi_device(ctx->dev);
 
        if (mipi_dsi_dcs_write_buffer(dsi, data, len) < 0)
-               DRM_WARN("mipi dsi dcs write buffer failed\n");
+               dev_warn(ctx->dev, "mipi dsi dcs write buffer failed\n");
 }
 
 static void otm8009a_dcs_write_buf_hs(struct otm8009a *ctx, const void *data,
@@ -313,7 +312,7 @@ static int otm8009a_prepare(struct drm_panel *panel)
 
        ret = regulator_enable(ctx->supply);
        if (ret < 0) {
-               DRM_ERROR("failed to enable supply: %d\n", ret);
+               dev_err(panel->dev, "failed to enable supply: %d\n", ret);
                return ret;
        }
 
@@ -355,9 +354,9 @@ static int otm8009a_get_modes(struct drm_panel *panel,
 
        mode = drm_mode_duplicate(connector->dev, &default_mode);
        if (!mode) {
-               DRM_ERROR("failed to add mode %ux%ux@%u\n",
-                         default_mode.hdisplay, default_mode.vdisplay,
-                         drm_mode_vrefresh(&default_mode));
+               dev_err(panel->dev, "failed to add mode %ux%u@%u\n",
+                       default_mode.hdisplay, default_mode.vdisplay,
+                       drm_mode_vrefresh(&default_mode));
                return -ENOMEM;
        }
 
@@ -390,7 +389,7 @@ static int otm8009a_backlight_update_status(struct backlight_device *bd)
        u8 data[2];
 
        if (!ctx->prepared) {
-               DRM_DEBUG("lcd not ready yet for setting its backlight!\n");
+               dev_dbg(&bd->dev, "lcd not ready yet for setting its backlight!\n");
                return -ENXIO;
        }