V4L/DVB (7638): CodingStyle fixes for au8522 and au0828

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

5 files changed, 32 insertions, 33 deletions

diff --git a/drivers/media/video/au0828/au0828-cards.c b/drivers/media/video/au0828/au0828-cards.c
index 688cb8d26b30..8ca91f814277 100644
--- a/drivers/media/video/au0828/au0828-cards.c
+++ b/drivers/media/video/au0828/au0828-cards.c
@@ -47,7 +47,7 @@ int au0828_tuner_callback(void *priv, int command, int arg)
 
         dprintk(1, "%s()\n", __func__);
 
-        switch(dev->board) {
+        switch (dev->board) {
         case AU0828_BOARD_HAUPPAUGE_HVR850:
         case AU0828_BOARD_HAUPPAUGE_HVR950Q:
         case AU0828_BOARD_DVICO_FUSIONHDTV7:
@@ -59,8 +59,7 @@ int au0828_tuner_callback(void *priv, int command, int arg)
                         au0828_set(dev, REG_001, 2);
                         mdelay(50);
                         return 0;
-                }
-                else {
+                } else {
                         printk(KERN_ERR
                                 "%s(): Unknown command.\n", __func__);
                         return -EINVAL;
@@ -103,7 +102,7 @@ void au0828_card_setup(struct au0828_dev *dev)
                 tveeprom_read(&dev->i2c_client, eeprom, sizeof(eeprom));
         }
 
-        switch(dev->board) {
+        switch (dev->board) {
         case AU0828_BOARD_HAUPPAUGE_HVR850:
         case AU0828_BOARD_HAUPPAUGE_HVR950Q:
                 if (dev->i2c_rc == 0)
@@ -121,7 +120,7 @@ void au0828_gpio_setup(struct au0828_dev *dev)
 {
         dprintk(1, "%s()\n", __func__);
 
-        switch(dev->board) {
+        switch (dev->board) {
         case AU0828_BOARD_HAUPPAUGE_HVR850:
         case AU0828_BOARD_HAUPPAUGE_HVR950Q:
                 /* GPIO's
diff --git a/drivers/media/video/au0828/au0828-core.c b/drivers/media/video/au0828/au0828-core.c
index 530c675e53a4..e65d5642cb1d 100644
--- a/drivers/media/video/au0828/au0828-core.c
+++ b/drivers/media/video/au0828/au0828-core.c
@@ -32,15 +32,15 @@
  * 4 = I2C related
  * 8 = Bridge related
  */
-unsigned int debug = 0;
+unsigned int debug;
 module_param(debug, int, 0644);
 MODULE_PARM_DESC(debug, "enable debug messages");
 
-unsigned int usb_debug = 0;
+unsigned int usb_debug;
 module_param(usb_debug, int, 0644);
 MODULE_PARM_DESC(usb_debug, "enable usb debug messages");
 
-unsigned int bridge_debug = 0;
+unsigned int bridge_debug;
 module_param(bridge_debug, int, 0644);
 MODULE_PARM_DESC(bridge_debug, "enable bridge debug messages");
 
@@ -66,16 +66,17 @@ u32 au0828_readreg(struct au0828_dev *dev, u16 reg)
 u32 au0828_writereg(struct au0828_dev *dev, u16 reg, u32 val)
 {
         dprintk(8, "%s(0x%x, 0x%x)\n", __func__, reg, val);
-        return send_control_msg(dev, CMD_REQUEST_OUT, val, reg, dev->ctrlmsg, 0);
+        return send_control_msg(dev, CMD_REQUEST_OUT, val, reg,
+                                dev->ctrlmsg, 0);
 }
 
 static void cmd_msg_dump(struct au0828_dev *dev)
 {
         int i;
 
-        for (i = 0;i < sizeof(dev->ctrlmsg); i+=16)
-                dprintk(2,"%s() %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x "
-                        "%02x %02x %02x %02x %02x %02x\n",
+        for (i = 0; i < sizeof(dev->ctrlmsg); i += 16)
+                dprintk(2, "%s() %02x %02x %02x %02x %02x %02x %02x %02x "
+                                "%02x %02x %02x %02x %02x %02x %02x %02x\n",
                         __func__,
                         dev->ctrlmsg[i+0], dev->ctrlmsg[i+1],
                         dev->ctrlmsg[i+2], dev->ctrlmsg[i+3],
@@ -136,8 +137,7 @@ static int recv_control_msg(struct au0828_dev *dev, u16 request, u32 value,
                 if (status < 0) {
                         printk(KERN_ERR "%s() Failed receiving control message, error %d.\n",
                                 __func__, status);
-                }
-                else
+                } else
                         cmd_msg_dump(dev);
         }
         mutex_unlock(&dev->mutex);
@@ -166,7 +166,7 @@ static void au0828_usb_disconnect(struct usb_interface *interface)
 
 }
 
-static int au0828_usb_probe (struct usb_interface *interface,
+static int au0828_usb_probe(struct usb_interface *interface,
         const struct usb_device_id *id)
 {
         int ifnum;
diff --git a/drivers/media/video/au0828/au0828-dvb.c b/drivers/media/video/au0828/au0828-dvb.c
index 4a27e5b41f53..85d0ae9a322f 100644
--- a/drivers/media/video/au0828/au0828-dvb.c
+++ b/drivers/media/video/au0828/au0828-dvb.c
@@ -111,9 +111,8 @@ static int start_urb_transfer(struct au0828_dev *dev)
         for (i = 0; i < URB_COUNT; i++) {
 
                 dev->urbs[i] = usb_alloc_urb(0, GFP_KERNEL);
-                if (!dev->urbs[i]) {
+                if (!dev->urbs[i])
                         goto err;
-                }
 
                 purb = dev->urbs[i];
 
diff --git a/drivers/media/video/au0828/au0828-i2c.c b/drivers/media/video/au0828/au0828-i2c.c
index ae73a6769296..94c8b74a6651 100644
--- a/drivers/media/video/au0828/au0828-i2c.c
+++ b/drivers/media/video/au0828/au0828-i2c.c
@@ -23,17 +23,17 @@
 #include <linux/moduleparam.h>
 #include <linux/init.h>
 #include <linux/delay.h>
-#include <asm/io.h>
+#include <linux/io.h>
 
 #include "au0828.h"
 
 #include <media/v4l2-common.h>
 
-unsigned int i2c_debug = 0;
+unsigned int i2c_debug;
 module_param(i2c_debug, int, 0444);
 MODULE_PARM_DESC(i2c_debug, "enable debug messages [i2c]");
 
-unsigned int i2c_scan = 0;
+unsigned int i2c_scan;
 module_param(i2c_scan, int, 0444);
 MODULE_PARM_DESC(i2c_scan, "scan i2c bus at insmod time");
 
@@ -323,9 +323,9 @@ static struct i2c_client au0828_i2c_client_template = {
 };
 
 static char *i2c_devs[128] = {
-        [ 0x8e >> 1 ] = "au8522",
-        [ 0xa0 >> 1 ] = "eeprom",
-        [ 0xc2 >> 1 ] = "tuner/xc5000",
+        [0x8e >> 1] = "au8522",
+        [0xa0 >> 1] = "eeprom",
+        [0xc2 >> 1] = "tuner/xc5000",
 };
 
 static void do_i2c_scan(char *name, struct i2c_client *c)
@@ -338,7 +338,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] : "???");
         }
 }
@@ -368,11 +368,11 @@ int au0828_i2c_register(struct au0828_dev *dev)
         dev->i2c_client.adapter = &dev->i2c_adap;
 
         if (0 == dev->i2c_rc) {
-                printk("%s: i2c bus registered\n", DRIVER_NAME);
+                printk(KERN_INFO "%s: i2c bus registered\n", DRIVER_NAME);
                 if (i2c_scan)
                         do_i2c_scan(DRIVER_NAME, &dev->i2c_client);
         } else
-                printk("%s: i2c bus register FAILED\n", DRIVER_NAME);
+                printk(KERN_INFO "%s: i2c bus register FAILED\n", DRIVER_NAME);
 
         return dev->i2c_rc;
 }
diff --git a/drivers/media/video/au0828/au0828.h b/drivers/media/video/au0828/au0828.h
index 7e6aeb727baa..0200b9fc5dc4 100644
--- a/drivers/media/video/au0828/au0828.h
+++ b/drivers/media/video/au0828/au0828.h
@@ -83,13 +83,14 @@ struct au0828_buff {
 };
 
 /* ----------------------------------------------------------- */
-#define au0828_read(dev,reg) au0828_readreg(dev,reg)
-#define au0828_write(dev,reg,value) au0828_writereg(dev,reg,value)
-#define au0828_andor(dev,reg,mask,value) \
- au0828_writereg(dev,reg,(au0828_readreg(dev,reg)&~(mask))|((value)&(mask)))
-
-#define au0828_set(dev,reg,bit) au0828_andor(dev,(reg),(bit),(bit))
-#define au0828_clear(dev,reg,bit) au0828_andor(dev,(reg),(bit),0)
+#define au0828_read(dev, reg) au0828_readreg(dev, reg)
+#define au0828_write(dev, reg, value) au0828_writereg(dev, reg, value)
+#define au0828_andor(dev, reg, mask, value)                             \
+         au0828_writereg(dev, reg,                                      \
+        (au0828_readreg(dev, reg) & ~(mask)) | ((value) & (mask)))
+
+#define au0828_set(dev, reg, bit) au0828_andor(dev, (reg), (bit), (bit))
+#define au0828_clear(dev, reg, bit) au0828_andor(dev, (reg), (bit), 0)
 
 /* ----------------------------------------------------------- */
 /* au0828-core.c */