Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[pandora-kernel.git] / drivers / gpu / drm / i915 / dvo_ch7017.c

diff --git a/drivers/gpu/drm/i915/dvo_ch7017.c b/drivers/gpu/drm/i915/dvo_ch7017.c
index 621815b..1184c14 100644 (file)
--- a/drivers/gpu/drm/i915/dvo_ch7017.c
+++ b/drivers/gpu/drm/i915/dvo_ch7017.c
@@ -249,7 +249,8 @@ static bool ch7017_init(struct intel_dvo_device *dvo,
        if (val != CH7017_DEVICE_ID_VALUE &&
            val != CH7018_DEVICE_ID_VALUE &&
            val != CH7019_DEVICE_ID_VALUE) {
-               DRM_DEBUG("ch701x not detected, got %d: from %s Slave %d.\n",
+               DRM_DEBUG_KMS("ch701x not detected, got %d: from %s "
+                               "Slave %d.\n",
                          val, i2cbus->adapter.name,dvo->slave_addr);
                goto fail;
        }
@@ -284,7 +285,7 @@ static void ch7017_mode_set(struct intel_dvo_device *dvo,
        uint8_t horizontal_active_pixel_output, vertical_active_line_output;
        uint8_t active_input_line_output;
 
-       DRM_DEBUG("Registers before mode setting\n");
+       DRM_DEBUG_KMS("Registers before mode setting\n");
        ch7017_dump_regs(dvo);
 
        /* LVDS PLL settings from page 75 of 7017-7017ds.pdf*/
@@ -346,7 +347,7 @@ static void ch7017_mode_set(struct intel_dvo_device *dvo,
        /* Turn the LVDS back on with new settings. */
        ch7017_write(dvo, CH7017_LVDS_POWER_DOWN, lvds_power_down);
 
-       DRM_DEBUG("Registers after mode setting\n");
+       DRM_DEBUG_KMS("Registers after mode setting\n");
        ch7017_dump_regs(dvo);
 }
 
@@ -386,7 +387,7 @@ static void ch7017_dump_regs(struct intel_dvo_device *dvo)
 #define DUMP(reg)                                      \
 do {                                                   \
        ch7017_read(dvo, reg, &val);                    \
-       DRM_DEBUG(#reg ": %02x\n", val);                \
+       DRM_DEBUG_KMS(#reg ": %02x\n", val);            \
 } while (0)
 
        DUMP(CH7017_HORIZONTAL_ACTIVE_PIXEL_INPUT);