V4L/DVB (9251): cx23885: Checkpatch compliance

cx23885: Checkpatch compliance

Signed-off-by: Steven Toth <stoth@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 24 insertions, 23 deletions

diff --git a/drivers/media/video/cx23885/cx23885-i2c.c b/drivers/media/video/cx23885/cx23885-i2c.c
index f98e476e961..bb7f71a1fcb 100644
--- a/drivers/media/video/cx23885/cx23885-i2c.c
+++ b/drivers/media/video/cx23885/cx23885-i2c.c
@@ -131,7 +131,7 @@ static int i2c_sendbytes(struct i2c_adapter *i2c_adap,
                         printk(" >\n");
         }
 
-        for (cnt = 1; cnt < msg->len; cnt++ ) {
+        for (cnt = 1; cnt < msg->len; cnt++) {
                 /* following bytes */
                 wdata = msg->buf[cnt];
                 ctrl = bus->i2c_period | (1 << 12) | (1 << 2);
@@ -151,9 +151,9 @@ static int i2c_sendbytes(struct i2c_adapter *i2c_adap,
                 if (retval == 0)
                         goto eio;
                 if (i2c_debug) {
-                        printk(" %02x", msg->buf[cnt]);
+                        dprintk(1, " %02x", msg->buf[cnt]);
                         if (!(ctrl & I2C_NOSTOP))
-                                printk(" >\n");
+                                dprintk(1, " >\n");
                 }
         }
         return msg->len;
@@ -162,7 +162,7 @@ static int i2c_sendbytes(struct i2c_adapter *i2c_adap,
         retval = -EIO;
  err:
         if (i2c_debug)
-                printk(" ERR: %d\n", retval);
+                printk(KERN_ERR " ERR: %d\n", retval);
         return retval;
 }
 
@@ -194,12 +194,12 @@ static int i2c_readbytes(struct i2c_adapter *i2c_adap,
 
         if (i2c_debug) {
                 if (joined)
-                        printk(" R");
+                        dprintk(1, " R");
                 else
-                        printk(" <R %02x", (msg->addr << 1) + 1);
+                        dprintk(1, " <R %02x", (msg->addr << 1) + 1);
         }
 
-        for(cnt = 0; cnt < msg->len; cnt++) {
+        for (cnt = 0; cnt < msg->len; cnt++) {
 
                 ctrl = bus->i2c_period | (1 << 12) | (1 << 2) | 1;
 
@@ -216,9 +216,9 @@ static int i2c_readbytes(struct i2c_adapter *i2c_adap,
                         goto eio;
                 msg->buf[cnt] = cx_read(bus->reg_rdata) & 0xff;
                 if (i2c_debug) {
-                        printk(" %02x", msg->buf[cnt]);
+                        dprintk(1, " %02x", msg->buf[cnt]);
                         if (!(ctrl & I2C_NOSTOP))
-                                printk(" >\n");
+                                dprintk(1, " >\n");
                 }
         }
         return msg->len;
@@ -227,7 +227,7 @@ static int i2c_readbytes(struct i2c_adapter *i2c_adap,
         retval = -EIO;
  err:
         if (i2c_debug)
-                printk(" ERR: %d\n", retval);
+                printk(KERN_ERR " ERR: %d\n", retval);
         return retval;
 }
 
@@ -353,17 +353,17 @@ static struct i2c_client cx23885_i2c_client_template = {
 };
 
 static char *i2c_devs[128] = {
-        [0x10 >> 1]   = "tda10048",
-        [0x12 >> 1]   = "dib7000pc",
-        [ 0x1c >> 1 ] = "lgdt3303",
-        [ 0x86 >> 1 ] = "tda9887",
-        [ 0x32 >> 1 ] = "cx24227",
-        [ 0x88 >> 1 ] = "cx25837",
-        [ 0x84 >> 1 ] = "tda8295",
-        [ 0xa0 >> 1 ] = "eeprom",
-        [ 0xc0 >> 1 ] = "tuner/mt2131/tda8275",
+        [0x10 >> 1] = "tda10048",
+        [0x12 >> 1] = "dib7000pc",
+        [0x1c >> 1] = "lgdt3303",
+        [0x86 >> 1] = "tda9887",
+        [0x32 >> 1] = "cx24227",
+        [0x88 >> 1] = "cx25837",
+        [0x84 >> 1] = "tda8295",
+        [0xa0 >> 1] = "eeprom",
+        [0xc0 >> 1] = "tuner/mt2131/tda8275",
         [0xc2 >> 1] = "tuner/mt2131/tda8275/xc5000/xc3028",
-        [0xc8 >> 1]   = "tuner/xc3028L",
+        [0xc8 >> 1] = "tuner/xc3028L",
 };
 
 static void do_i2c_scan(char *name, struct i2c_client *c)
@@ -376,7 +376,7 @@ static void do_i2c_scan(char *name, struct i2c_client *c)
                 rc = i2c_master_recv(c, &buf, 0);
                 if (rc < 0)
                         continue;
-                printk("%s: i2c scan: found device @ 0x%x  [%s]\n",
+                printk(KERN_INFO "%s: i2c scan: found device @ 0x%x  [%s]\n",
                        name, i << 1, i2c_devs[i] ? i2c_devs[i] : "???");
         }
 }
@@ -408,11 +408,12 @@ int cx23885_i2c_register(struct cx23885_i2c *bus)
         bus->i2c_client.adapter = &bus->i2c_adap;
 
         if (0 == bus->i2c_rc) {
-                printk("%s: i2c bus %d registered\n", dev->name, bus->nr);
+                dprintk(1, "%s: i2c bus %d registered\n", dev->name, bus->nr);
                 if (i2c_scan)
                         do_i2c_scan(dev->name, &bus->i2c_client);
         } else
-                printk("%s: i2c bus %d register FAILED\n", dev->name, bus->nr);
+                printk(KERN_WARNING "%s: i2c bus %d register FAILED\n",
+                        dev->name, bus->nr);
 
         return bus->i2c_rc;
 }