gma500: CodingStyle pass

[pandora-kernel.git] / drivers / staging / gma500 / psb_intel_sdvo.c

diff --git a/drivers/staging/gma500/psb_intel_sdvo.c b/drivers/staging/gma500/psb_intel_sdvo.c
index df1c006..a4bad1a 100644 (file)
--- a/drivers/staging/gma500/psb_intel_sdvo.c
+++ b/drivers/staging/gma500/psb_intel_sdvo.c
@@ -107,14 +107,10 @@ static bool psb_intel_sdvo_read_byte(
 
        ret = i2c_transfer(&sdvo_priv->i2c_bus->adapter, msgs, 2);
        if (ret == 2) {
-               /* DRM_DEBUG("got back from addr %02X = %02x\n",
-                * out_buf[0], buf[0]);
-                */
                *ch = buf[0];
                return true;
        }
 
-       DRM_DEBUG("i2c transfer returned %d\n", ret);
        return false;
 }
 
@@ -205,24 +201,25 @@ static void psb_intel_sdvo_write_cmd(struct psb_intel_output *psb_intel_output,
        int i;
 
        if (0) {
-               DRM_DEBUG("%s: W: %02X ", SDVO_NAME(sdvo_priv), cmd);
+               printk(KERN_DEBUG "%s: W: %02X ", SDVO_NAME(sdvo_priv), cmd);
                for (i = 0; i < args_len; i++)
-                       printk(KERN_INFO"%02X ", ((u8 *) args)[i]);
+                       printk(KERN_CONT "%02X ", ((u8 *) args)[i]);
                for (; i < 8; i++)
-                       printk("   ");
+                       printk(KERN_CONT "   ");
                for (i = 0;
                     i <
                     sizeof(sdvo_cmd_names) / sizeof(sdvo_cmd_names[0]);
                     i++) {
                        if (cmd == sdvo_cmd_names[i].cmd) {
-                               printk("(%s)", sdvo_cmd_names[i].name);
+                               printk(KERN_CONT
+                                       "(%s)", sdvo_cmd_names[i].name);
                                break;
                        }
                }
                if (i ==
                    sizeof(sdvo_cmd_names) / sizeof(sdvo_cmd_names[0]))
-                       printk("(%02X)", cmd);
-               printk("\n");
+                       printk(KERN_CONT "(%02X)", cmd);
+               printk(KERN_CONT "\n");
        }
 
        for (i = 0; i < args_len; i++) {
@@ -267,17 +264,17 @@ static u8 psb_intel_sdvo_read_response(
                                         &status);
 
                if (0) {
-                       DRM_DEBUG("%s: R: ", SDVO_NAME(sdvo_priv));
+                       pr_debug("%s: R: ", SDVO_NAME(sdvo_priv));
                        for (i = 0; i < response_len; i++)
-                               printk(KERN_INFO"%02X ", ((u8 *) response)[i]);
+                               printk(KERN_CONT "%02X ", ((u8 *) response)[i]);
                        for (; i < 8; i++)
                                printk("   ");
                        if (status <= SDVO_CMD_STATUS_SCALING_NOT_SUPP)
-                               printk(KERN_INFO"(%s)",
+                               printk(KERN_CONT "(%s)",
                                         cmd_status_names[status]);
                        else
-                               printk(KERN_INFO"(??? %d)", status);
-                       printk("\n");
+                               printk(KERN_CONT "(??? %d)", status);
+                       printk(KERN_CONT "\n");
                }
 
                if (status != SDVO_CMD_STATUS_PENDING)
@@ -997,7 +994,6 @@ int psb_intel_sdvo_supports_hotplug(struct drm_connector *connector)
        u8 response[2];
        u8 status;
        struct psb_intel_output *psb_intel_output;
-       DRM_DEBUG("\n");
 
        if (!connector)
                return 0;
@@ -1198,7 +1194,7 @@ void psb_intel_sdvo_init(struct drm_device *dev, int output_device)
        /* Read the regs to test if we can talk to the device */
        for (i = 0; i < 0x40; i++) {
                if (!psb_intel_sdvo_read_byte(psb_intel_output, i, &ch[i])) {
-                       DRM_DEBUG("No SDVO device found on SDVO%c\n",
+                       dev_dbg(dev->dev, "No SDVO device found on SDVO%c\n",
                                  output_device == SDVOB ? 'B' : 'C');
                        goto err_i2c;
                }
@@ -1242,8 +1238,7 @@ void psb_intel_sdvo_init(struct drm_device *dev, int output_device)
                unsigned char bytes[2];
 
                memcpy(bytes, &sdvo_priv->caps.output_flags, 2);
-               DRM_DEBUG
-                   ("%s: No active RGB or TMDS outputs (0x%02x%02x)\n",
+               dev_dbg(dev->dev, "%s: No active RGB or TMDS outputs (0x%02x%02x)\n",
                     SDVO_NAME(sdvo_priv), bytes[0], bytes[1]);
                goto err_i2c;
        }
@@ -1267,7 +1262,7 @@ void psb_intel_sdvo_init(struct drm_device *dev, int output_device)
                                               pixel_clock_max);
 
 
-       DRM_DEBUG("%s device VID/DID: %02X:%02X.%02X, "
+       dev_dbg(dev->dev, "%s device VID/DID: %02X:%02X.%02X, "
                  "clock range %dMHz - %dMHz, "
                  "input 1: %c, input 2: %c, "
                  "output 1: %c, output 2: %c\n",