V4L/DVB (7634): au0828: Cleanup

au0828: Cleanup

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

diff --git a/drivers/media/video/au0828/au0828-cards.c b/drivers/media/video/au0828/au0828-cards.c
index 5c9c3ae..f6c6228 100644 (file)
--- a/drivers/media/video/au0828/au0828-cards.c
+++ b/drivers/media/video/au0828/au0828-cards.c
@@ -51,7 +51,7 @@ int au0828_tuner_callback(void *priv, int command, int arg)
        case AU0828_BOARD_HAUPPAUGE_HVR850:
        case AU0828_BOARD_HAUPPAUGE_HVR950Q:
        case AU0828_BOARD_DVICO_FUSIONHDTV7:
-               if(command == 0) {
+               if (command == 0) {
                        /* Tuner Reset Command from xc5000 */
                        /* Drive the tuner into reset and out */
                        au0828_clear(dev, REG_001, 2);
@@ -78,8 +78,7 @@ static void hauppauge_eeprom(struct au0828_dev *dev, u8 *eeprom_data)
        tveeprom_hauppauge_analog(&dev->i2c_client, &tv, eeprom_data);
 
        /* Make sure we support the board model */
-       switch (tv.model)
-       {
+       switch (tv.model) {
        case 72001: /* WinTV-HVR950q (Retail, IR, ATSC/QAM and basic analog video */
                break;
        default:
@@ -92,7 +91,6 @@ static void hauppauge_eeprom(struct au0828_dev *dev, u8 *eeprom_data)
               __func__, tv.model);
 }
 
-
 void au0828_card_setup(struct au0828_dev *dev)
 {
        static u8 eeprom[256];
@@ -116,7 +114,7 @@ void au0828_card_setup(struct au0828_dev *dev)
 /*
  * The bridge has between 8 and 12 gpios.
  * Regs 1 and 0 deal with output enables.
- * Regs 3 and 2 * deal with direction.
+ * Regs 3 and 2 deal with direction.
  */
 void au0828_gpio_setup(struct au0828_dev *dev)
 {

diff --git a/drivers/media/video/au0828/au0828-core.c b/drivers/media/video/au0828/au0828-core.c
index efecac3..530c675 100644 (file)
--- a/drivers/media/video/au0828/au0828-core.c
+++ b/drivers/media/video/au0828/au0828-core.c
@@ -143,6 +143,7 @@ static int recv_control_msg(struct au0828_dev *dev, u16 request, u32 value,
        mutex_unlock(&dev->mutex);
        return status;
 }
+
 static void au0828_usb_disconnect(struct usb_interface *interface)
 {
        struct au0828_dev *dev = usb_get_intfdata(interface);
@@ -177,7 +178,7 @@ static int au0828_usb_probe (struct usb_interface *interface,
        if (ifnum != 0)
                return -ENODEV;
 
-       dprintk(1,"%s() vendor id 0x%x device id 0x%x ifnum:%d\n", __func__,
+       dprintk(1, "%s() vendor id 0x%x device id 0x%x ifnum:%d\n", __func__,
                le16_to_cpu(usbdev->descriptor.idVendor),
                le16_to_cpu(usbdev->descriptor.idProduct),
                ifnum);
@@ -228,20 +229,20 @@ static int __init au0828_init(void)
 {
        int ret;
 
-       if(debug)
+       if (debug)
                printk(KERN_INFO "%s() Debugging is enabled\n", __func__);
 
-       if(usb_debug) {
+       if (usb_debug) {
                printk(KERN_INFO "%s() USB Debugging is enabled\n", __func__);
                debug |= 2;
        }
 
-       if(i2c_debug) {
+       if (i2c_debug) {
                printk(KERN_INFO "%s() I2C Debugging is enabled\n", __func__);
                debug |= 4;
        }
 
-       if(bridge_debug) {
+       if (bridge_debug) {
                printk(KERN_INFO "%s() Bridge Debugging is enabled\n",
                       __func__);
                debug |= 8;

diff --git a/drivers/media/video/au0828/au0828-dvb.c b/drivers/media/video/au0828/au0828-dvb.c
index 8853f4e..4a27e5b 100644 (file)
--- a/drivers/media/video/au0828/au0828-dvb.c
+++ b/drivers/media/video/au0828/au0828-dvb.c
@@ -31,6 +31,9 @@
 
 DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
 
+#define _AU0828_BULKPIPE 0x83
+#define _BULKPIPESIZE 0xe522
+
 static struct au8522_config hauppauge_hvr950q_config = {
        .demod_address = 0x8e >> 1,
        .status_mode   = AU8522_DEMODLOCKING,
@@ -66,7 +69,8 @@ static void urb_completion(struct urb *purb)
        ptr = (u8 *)purb->transfer_buffer;
 
        /* Feed the transport payload into the kernel demux */
-       dvb_dmx_swfilter_packets(&dev->dvb.demux, purb->transfer_buffer, purb->actual_length / 188);
+       dvb_dmx_swfilter_packets(&dev->dvb.demux,
+               purb->transfer_buffer, purb->actual_length / 188);
 
        /* Clean the buffer before we requeue */
        memset(purb->transfer_buffer, 0, URB_BUFSIZE);
@@ -81,7 +85,6 @@ static int stop_urb_transfer(struct au0828_dev *dev)
 
        dprintk(2, "%s()\n", __func__);
 
-       /* FIXME:  Do we need to free the transfer_buffers? */
        for (i = 0; i < URB_COUNT; i++) {
                usb_kill_urb(dev->urbs[i]);
                kfree(dev->urbs[i]->transfer_buffer);
@@ -93,9 +96,6 @@ static int stop_urb_transfer(struct au0828_dev *dev)
        return 0;
 }
 
-#define _AU0828_BULKPIPE 0x83
-#define _BULKPIPESIZE 0xe522
-
 static int start_urb_transfer(struct au0828_dev *dev)
 {
        struct urb *purb;
@@ -306,7 +306,7 @@ void au0828_dvb_unregister(struct au0828_dev *dev)
 
        dprintk(1, "%s()\n", __func__);
 
-       if(dvb->frontend == NULL)
+       if (dvb->frontend == NULL)
                return;
 
        dvb_net_release(&dvb->net);

diff --git a/drivers/media/video/au0828/au0828-i2c.c b/drivers/media/video/au0828/au0828-i2c.c
index c1e1cf6..ae73a67 100644 (file)
--- a/drivers/media/video/au0828/au0828-i2c.c
+++ b/drivers/media/video/au0828/au0828-i2c.c
@@ -151,7 +151,7 @@ static int i2c_sendbytes(struct i2c_adapter *i2c_adap,
 
        dprintk(4, "SEND: %02x\n", msg->addr);
 
-       for (i=0; i < msg->len;) {
+       for (i = 0; i < msg->len;) {
 
                dprintk(4, " %02x\n", msg->buf[i]);
 
@@ -210,7 +210,7 @@ static int i2c_readbytes(struct i2c_adapter *i2c_adap,
                return 0;
        }
 
-       for (i=0; i < msg->len;) {
+       for (i = 0; i < msg->len;) {
 
                i++;
 
@@ -241,7 +241,7 @@ static int i2c_xfer(struct i2c_adapter *i2c_adap,
 
        dprintk(4, "%s(num = %d)\n", __func__, num);
 
-       for (i = 0 ; i < num; i++) {
+       for (i = 0; i < num; i++) {
                dprintk(4, "%s(num = %d) addr = 0x%02x  len = 0x%x\n",
                        __func__, num, msgs[i].addr, msgs[i].len);
                if (msgs[i].flags & I2C_M_RD) {

diff --git a/drivers/media/video/au0828/au0828-reg.h b/drivers/media/video/au0828/au0828-reg.h
index c501f6a..3982755 100644 (file)
--- a/drivers/media/video/au0828/au0828-reg.h
+++ b/drivers/media/video/au0828/au0828-reg.h
@@ -19,6 +19,9 @@
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+/* We'll start to rename these registers once we have a better
+ * understanding of their meaning.
+ */
 #define REG_000 0x000
 #define REG_001 0x001
 #define REG_002 0x002

diff --git a/drivers/media/video/au0828/au0828.h b/drivers/media/video/au0828/au0828.h
index 9442677..7e6aeb7 100644 (file)
--- a/drivers/media/video/au0828/au0828.h
+++ b/drivers/media/video/au0828/au0828.h
@@ -37,7 +37,6 @@
 
 #define DRIVER_NAME "au0828"
 #define URB_COUNT   16
-//#define URB_BUFSIZE (312 * 188)
 #define URB_BUFSIZE (0xe522)
 
 struct au0828_board {