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

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

diff --git a/drivers/media/dvb/frontends/au8522.c b/drivers/media/dvb/frontends/au8522.c
index dbea1da79672d5b37b15ca0146ec718b74696ab8..e340faacc78b938105c44d5c88bcf655bde51930 100644 (file)
--- a/drivers/media/dvb/frontends/au8522.c
+++ b/drivers/media/dvb/frontends/au8522.c
@@ -43,8 +43,12 @@ struct au8522_state {
 
 };
 
-static int debug = 0;
-#define dprintk        if (debug) printk
+static int debug;
+
+#define dprintk(arg...) do {           \
+       if (debug)                      \
+                printk(##arg); }       \
+       } while (0)
 
 /* 16 bit registers, 8 bit values */
 static int au8522_writereg(struct au8522_state *state, u16 reg, u8 data)
@@ -284,7 +288,8 @@ static struct mse2snr_tab qam256_mse2snr_tab[] = {
        { 256, 280 },
 };
 
-static int au8522_mse2snr_lookup(struct mse2snr_tab *tab, int sz, int mse, u16 *snr)
+static int au8522_mse2snr_lookup(struct mse2snr_tab *tab, int sz, int mse,
+                                u16 *snr)
 {
        int i, ret = -EINVAL;
        dprintk("%s()\n", __func__);
@@ -427,7 +432,7 @@ static int au8522_enable_modulation(struct dvb_frontend *fe,
 
        dprintk("%s(0x%08x)\n", __func__, m);
 
-       switch(m) {
+       switch (m) {
        case VSB_8:
                dprintk("%s() VSB_8\n", __func__);
                for (i = 0; i < ARRAY_SIZE(VSB_mod_tab); i++)
@@ -469,9 +474,11 @@ static int au8522_set_frontend(struct dvb_frontend *fe,
        msleep(100);
 
        if (fe->ops.tuner_ops.set_params) {
-               if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 1);
+               if (fe->ops.i2c_gate_ctrl)
+                       fe->ops.i2c_gate_ctrl(fe, 1);
                fe->ops.tuner_ops.set_params(fe, p);
-               if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0);
+               if (fe->ops.i2c_gate_ctrl)
+                       fe->ops.i2c_gate_ctrl(fe, 0);
        }
 
        return 0;
@@ -515,7 +522,7 @@ static int au8522_read_status(struct dvb_frontend *fe, fe_status_t *status)
                        *status |= FE_HAS_LOCK | FE_HAS_SYNC;
        }
 
-       switch(state->config->status_mode) {
+       switch (state->config->status_mode) {
        case AU8522_DEMODLOCKING:
                dprintk("%s() DEMODLOCKING\n", __func__);
                if (*status & FE_HAS_VITERBI)
@@ -651,6 +658,7 @@ error:
        kfree(state);
        return NULL;
 }
+EXPORT_SYMBOL(au8522_attach);
 
 static struct dvb_frontend_ops au8522_ops = {
 
@@ -682,10 +690,3 @@ MODULE_PARM_DESC(debug, "Enable verbose debug messages");
 MODULE_DESCRIPTION("Auvitek AU8522 QAM-B/ATSC Demodulator driver");
 MODULE_AUTHOR("Steven Toth");
 MODULE_LICENSE("GPL");
-
-EXPORT_SYMBOL(au8522_attach);
-
-/*
- * Local variables:
- * c-basic-offset: 8
- */

diff --git a/drivers/media/dvb/frontends/au8522.h b/drivers/media/dvb/frontends/au8522.h
index 19d5d1ef98426b835501a1d9c66570a5d75e4b23..d7affa3cdb27536190d24293ca658729740b95e5 100644 (file)
--- a/drivers/media/dvb/frontends/au8522.h
+++ b/drivers/media/dvb/frontends/au8522.h
@@ -24,8 +24,7 @@
 
 #include <linux/dvb/frontend.h>
 
-struct au8522_config
-{
+struct au8522_config {
        /* the demodulator's i2c address */
        u8 demod_address;
 
@@ -35,7 +34,8 @@ struct au8522_config
        u8 status_mode;
 };
 
-#if defined(CONFIG_DVB_AU8522) || (defined(CONFIG_DVB_AU8522_MODULE) && defined(MODULE))
+#if defined(CONFIG_DVB_AU8522) ||                              \
+           (defined(CONFIG_DVB_AU8522_MODULE) && defined(MODULE))
 extern struct dvb_frontend *au8522_attach(const struct au8522_config *config,
                                          struct i2c_adapter *i2c);
 #else

diff --git a/drivers/media/video/au0828/au0828-cards.c b/drivers/media/video/au0828/au0828-cards.c
index 688cb8d26b30e5033a10de92e023542d5f63555e..8ca91f814277d0ced5d9b1e7ccb1914d15d50727 100644 (file)
--- 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 530c675e53a4ded45bbb400919860a3861384a5c..e65d5642cb1d3b6ae64ce65b0bb7597e24a606a4 100644 (file)
--- 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 4a27e5b41f53f218c4c3cf20a753f7302e336213..85d0ae9a322f2c1fd43c36a7a7e28842ce91498e 100644 (file)
--- 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 ae73a67692967bcf8848073ff1baa1e1bdb180ce..94c8b74a6651ddfc62099efd89629ed4dc768a97 100644 (file)
--- 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 7e6aeb727baaf8fad84e65d507cbb9774aabc6fa..0200b9fc5dc442337bc4f4b7809b22bc7645df6e 100644 (file)
--- 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 */