V4L/DVB (11288): Code cleanup (passes checkpatch now) of the b2c2-flexcop-drivers 2/2

This is the second part of the code cleanup changing the usb and pci-driver cores.

Signed-off-by: Uwe Bugla <uwe.bugla@gmx.de>
Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

2 files changed, 281 insertions, 251 deletions

diff --git a/drivers/media/dvb/b2c2/flexcop-pci.c b/drivers/media/dvb/b2c2/flexcop-pci.c
index 84d2252045c..227c0200b70 100644
--- a/drivers/media/dvb/b2c2/flexcop-pci.c
+++ b/drivers/media/dvb/b2c2/flexcop-pci.c
@@ -1,9 +1,7 @@
 /*
- * This file is part of linux driver the digital TV devices equipped with B2C2 FlexcopII(b)/III
- *
- * flexcop-pci.c - covers the PCI part including DMA transfers.
- *
- * see flexcop.c for copyright information.
+ * Linux driver the digital TV devices equipped with B2C2 FlexcopII(b)/III
+ * flexcop-pci.c - covers the PCI part including DMA transfers
+ * see flexcop.c for copyright information
  */
 
 #define FC_LOG_PREFIX "flexcop-pci"
@@ -11,7 +9,8 @@
 
 static int enable_pid_filtering = 1;
 module_param(enable_pid_filtering, int, 0444);
-MODULE_PARM_DESC(enable_pid_filtering, "enable hardware pid filtering: supported values: 0 (fullts), 1");
+MODULE_PARM_DESC(enable_pid_filtering,
+        "enable hardware pid filtering: supported values: 0 (fullts), 1");
 
 static int irq_chk_intv = 100;
 module_param(irq_chk_intv, int, 0644);
@@ -26,17 +25,17 @@ MODULE_PARM_DESC(irq_chk_intv, "set the interval for IRQ streaming watchdog.");
 #define DEBSTATUS " (debugging is not enabled)"
 #endif
 
-#define deb_info(args...)  dprintk(0x01,args)
-#define deb_reg(args...)   dprintk(0x02,args)
-#define deb_ts(args...)    dprintk(0x04,args)
-#define deb_irq(args...)   dprintk(0x08,args)
-#define deb_chk(args...)   dprintk(0x10,args)
+#define deb_info(args...) dprintk(0x01, args)
+#define deb_reg(args...) dprintk(0x02, args)
+#define deb_ts(args...) dprintk(0x04, args)
+#define deb_irq(args...) dprintk(0x08, args)
+#define deb_chk(args...) dprintk(0x10, args)
 
 static int debug;
 module_param(debug, int, 0644);
 MODULE_PARM_DESC(debug,
         "set debug level (1=info,2=regs,4=TS,8=irqdma,16=check (|-able))."
-         DEBSTATUS);
+        DEBSTATUS);
 
 #define DRIVER_VERSION "0.1"
 #define DRIVER_NAME "Technisat/B2C2 FlexCop II/IIb/III Digital TV PCI Driver"
@@ -51,30 +50,30 @@ struct flexcop_pci {
 
         void __iomem *io_mem;
         u32 irq;
-/* buffersize (at least for DMA1, need to be % 188 == 0,
- * this logic is required */
+        /* buffersize (at least for DMA1, need to be % 188 == 0,
+         * this logic is required */
 #define FC_DEFAULT_DMA1_BUFSIZE (1280 * 188)
 #define FC_DEFAULT_DMA2_BUFSIZE (10 * 188)
         struct flexcop_dma dma[2];
 
         int active_dma1_addr; /* 0 = addr0 of dma1; 1 = addr1 of dma1 */
-        u32 last_dma1_cur_pos; /* position of the pointer last time the timer/packet irq occured */
+        u32 last_dma1_cur_pos;
+        /* position of the pointer last time the timer/packet irq occured */
         int count;
         int count_prev;
         int stream_problem;
 
         spinlock_t irq_lock;
-
         unsigned long last_irq;
 
         struct delayed_work irq_check_work;
-
         struct flexcop_device *fc_dev;
 };
 
-static int lastwreg,lastwval,lastrreg,lastrval;
+static int lastwreg, lastwval, lastrreg, lastrval;
 
-static flexcop_ibi_value flexcop_pci_read_ibi_reg (struct flexcop_device *fc, flexcop_ibi_register r)
+static flexcop_ibi_value flexcop_pci_read_ibi_reg(struct flexcop_device *fc,
+                flexcop_ibi_register r)
 {
         struct flexcop_pci *fc_pci = fc->bus_specific;
         flexcop_ibi_value v;
@@ -82,19 +81,20 @@ static flexcop_ibi_value flexcop_pci_read_ibi_reg (struct flexcop_device *fc, fl
 
         if (lastrreg != r || lastrval != v.raw) {
                 lastrreg = r; lastrval = v.raw;
-                deb_reg("new rd: %3x: %08x\n",r,v.raw);
+                deb_reg("new rd: %3x: %08x\n", r, v.raw);
         }
 
         return v;
 }
 
-static int flexcop_pci_write_ibi_reg(struct flexcop_device *fc, flexcop_ibi_register r, flexcop_ibi_value v)
+static int flexcop_pci_write_ibi_reg(struct flexcop_device *fc,
+                flexcop_ibi_register r, flexcop_ibi_value v)
 {
         struct flexcop_pci *fc_pci = fc->bus_specific;
 
         if (lastwreg != r || lastwval != v.raw) {
                 lastwreg = r; lastwval = v.raw;
-                deb_reg("new wr: %3x: %08x\n",r,v.raw);
+                deb_reg("new wr: %3x: %08x\n", r, v.raw);
         }
 
         writel(v.raw, fc_pci->io_mem + r);
@@ -117,12 +117,12 @@ static void flexcop_pci_irq_check_work(struct work_struct *work)
 
                                 spin_lock_irq(&fc->demux.lock);
                                 list_for_each_entry(feed, &fc->demux.feed_list,
-                                        list_head) {
+                                                list_head) {
                                         flexcop_pid_feed_control(fc, feed, 0);
                                 }
 
                                 list_for_each_entry(feed, &fc->demux.feed_list,
-                                        list_head) {
+                                                list_head) {
                                         flexcop_pid_feed_control(fc, feed, 1);
                                 }
                                 spin_unlock_irq(&fc->demux.lock);
@@ -150,11 +150,10 @@ static irqreturn_t flexcop_pci_isr(int irq, void *dev_id)
         flexcop_ibi_value v;
         irqreturn_t ret = IRQ_HANDLED;
 
-        spin_lock_irqsave(&fc_pci->irq_lock,flags);
-
-        v = fc->read_ibi_reg(fc,irq_20c);
+        spin_lock_irqsave(&fc_pci->irq_lock, flags);
+        v = fc->read_ibi_reg(fc, irq_20c);
 
-   /* errors */
+        /* errors */
         if (v.irq_20c.Data_receiver_error)
                 deb_chk("data receiver error\n");
         if (v.irq_20c.Continuity_error_flag)
@@ -165,24 +164,29 @@ static irqreturn_t flexcop_pci_isr(int irq, void *dev_id)
                 deb_chk("Transport error\n");
 
         if ((fc_pci->count % 1000) == 0)
-                deb_chk("%d valid irq took place so far\n",fc_pci->count);
+                deb_chk("%d valid irq took place so far\n", fc_pci->count);
 
         if (v.irq_20c.DMA1_IRQ_Status == 1) {
                 if (fc_pci->active_dma1_addr == 0)
-                        flexcop_pass_dmx_packets(fc_pci->fc_dev,fc_pci->dma[0].cpu_addr0,fc_pci->dma[0].size / 188);
+                        flexcop_pass_dmx_packets(fc_pci->fc_dev,
+                                        fc_pci->dma[0].cpu_addr0,
+                                        fc_pci->dma[0].size / 188);
                 else
-                        flexcop_pass_dmx_packets(fc_pci->fc_dev,fc_pci->dma[0].cpu_addr1,fc_pci->dma[0].size / 188);
+                        flexcop_pass_dmx_packets(fc_pci->fc_dev,
+                                        fc_pci->dma[0].cpu_addr1,
+                                        fc_pci->dma[0].size / 188);
 
                 deb_irq("page change to page: %d\n",!fc_pci->active_dma1_addr);
                 fc_pci->active_dma1_addr = !fc_pci->active_dma1_addr;
-        } else if (v.irq_20c.DMA1_Timer_Status == 1) {
                 /* for the timer IRQ we only can use buffer dmx feeding, because we don't have
                  * complete TS packets when reading from the DMA memory */
+        } else if (v.irq_20c.DMA1_Timer_Status == 1) {
                 dma_addr_t cur_addr =
                         fc->read_ibi_reg(fc,dma1_008).dma_0x8.dma_cur_addr << 2;
                 u32 cur_pos = cur_addr - fc_pci->dma[0].dma_addr0;
 
-                deb_irq("%u irq: %08x cur_addr: %llx: cur_pos: %08x, last_cur_pos: %08x ",
+                deb_irq("%u irq: %08x cur_addr: %llx: cur_pos: %08x, "
+                        "last_cur_pos: %08x ",
                                 jiffies_to_usecs(jiffies - fc_pci->last_irq),
                                 v.raw, (unsigned long long)cur_addr, cur_pos,
                                 fc_pci->last_dma1_cur_pos);
@@ -192,30 +196,36 @@ static irqreturn_t flexcop_pci_isr(int irq, void *dev_id)
                  * pass the data from last_cur_pos to the buffer end to the demux
                  */
                 if (cur_pos < fc_pci->last_dma1_cur_pos) {
-                        deb_irq(" end was reached: passing %d bytes ",(fc_pci->dma[0].size*2 - 1) - fc_pci->last_dma1_cur_pos);
+                        deb_irq(" end was reached: passing %d bytes ",
+                                (fc_pci->dma[0].size*2 - 1) -
+                                fc_pci->last_dma1_cur_pos);
                         flexcop_pass_dmx_data(fc_pci->fc_dev,
-                                        fc_pci->dma[0].cpu_addr0 + fc_pci->last_dma1_cur_pos,
-                                        (fc_pci->dma[0].size*2) - fc_pci->last_dma1_cur_pos);
+                                fc_pci->dma[0].cpu_addr0 +
+                                        fc_pci->last_dma1_cur_pos,
+                                (fc_pci->dma[0].size*2) -
+                                        fc_pci->last_dma1_cur_pos);
                         fc_pci->last_dma1_cur_pos = 0;
                 }
 
                 if (cur_pos > fc_pci->last_dma1_cur_pos) {
-                        deb_irq(" passing %d bytes ",cur_pos - fc_pci->last_dma1_cur_pos);
+                        deb_irq(" passing %d bytes ",
+                                cur_pos - fc_pci->last_dma1_cur_pos);
                         flexcop_pass_dmx_data(fc_pci->fc_dev,
-                                        fc_pci->dma[0].cpu_addr0 + fc_pci->last_dma1_cur_pos,
-                                        cur_pos - fc_pci->last_dma1_cur_pos);
+                                fc_pci->dma[0].cpu_addr0 +
+                                        fc_pci->last_dma1_cur_pos,
+                                cur_pos - fc_pci->last_dma1_cur_pos);
                 }
                 deb_irq("\n");
 
                 fc_pci->last_dma1_cur_pos = cur_pos;
                 fc_pci->count++;
         } else {
-                deb_irq("isr for flexcop called, apparently without reason (%08x)\n",v.raw);
+                deb_irq("isr for flexcop called, "
+                        "apparently without reason (%08x)\n", v.raw);
                 ret = IRQ_NONE;
         }
 
-        spin_unlock_irqrestore(&fc_pci->irq_lock,flags);
-
+        spin_unlock_irqrestore(&fc_pci->irq_lock, flags);
         return ret;
 }
 
@@ -223,52 +233,48 @@ static int flexcop_pci_stream_control(struct flexcop_device *fc, int onoff)
 {
         struct flexcop_pci *fc_pci = fc->bus_specific;
         if (onoff) {
-                flexcop_dma_config(fc,&fc_pci->dma[0],FC_DMA_1);
-                flexcop_dma_config(fc,&fc_pci->dma[1],FC_DMA_2);
-
-                flexcop_dma_config_timer(fc,FC_DMA_1,0);
-
-                flexcop_dma_xfer_control(fc,FC_DMA_1,FC_DMA_SUBADDR_0 | FC_DMA_SUBADDR_1,1);
+                flexcop_dma_config(fc, &fc_pci->dma[0], FC_DMA_1);
+                flexcop_dma_config(fc, &fc_pci->dma[1], FC_DMA_2);
+                flexcop_dma_config_timer(fc, FC_DMA_1, 0);
+                flexcop_dma_xfer_control(fc, FC_DMA_1,
+                                FC_DMA_SUBADDR_0 | FC_DMA_SUBADDR_1, 1);
                 deb_irq("DMA xfer enabled\n");
 
                 fc_pci->last_dma1_cur_pos = 0;
-                flexcop_dma_control_timer_irq(fc,FC_DMA_1,1);
+                flexcop_dma_control_timer_irq(fc, FC_DMA_1, 1);
                 deb_irq("IRQ enabled\n");
-
                 fc_pci->count_prev = fc_pci->count;
-
-//              fc_pci->active_dma1_addr = 0;
-//              flexcop_dma_control_size_irq(fc,FC_DMA_1,1);
-
         } else {
-                flexcop_dma_control_timer_irq(fc,FC_DMA_1,0);
+                flexcop_dma_control_timer_irq(fc, FC_DMA_1, 0);
                 deb_irq("IRQ disabled\n");
 
-//              flexcop_dma_control_size_irq(fc,FC_DMA_1,0);
-
-                flexcop_dma_xfer_control(fc,FC_DMA_1,FC_DMA_SUBADDR_0 | FC_DMA_SUBADDR_1,0);
+                flexcop_dma_xfer_control(fc, FC_DMA_1,
+                         FC_DMA_SUBADDR_0 | FC_DMA_SUBADDR_1, 0);
                 deb_irq("DMA xfer disabled\n");
         }
-
         return 0;
 }
 
 static int flexcop_pci_dma_init(struct flexcop_pci *fc_pci)
 {
         int ret;
-        if ((ret = flexcop_dma_allocate(fc_pci->pdev,&fc_pci->dma[0],FC_DEFAULT_DMA1_BUFSIZE)) != 0)
+        ret = flexcop_dma_allocate(fc_pci->pdev, &fc_pci->dma[0],
+                        FC_DEFAULT_DMA1_BUFSIZE);
+        if (ret != 0)
                 return ret;
 
-        if ((ret = flexcop_dma_allocate(fc_pci->pdev,&fc_pci->dma[1],FC_DEFAULT_DMA2_BUFSIZE)) != 0) {
+        ret = flexcop_dma_allocate(fc_pci->pdev, &fc_pci->dma[1],
+                        FC_DEFAULT_DMA2_BUFSIZE);
+        if (ret != 0) {
                 flexcop_dma_free(&fc_pci->dma[0]);
                 return ret;
         }
 
-        flexcop_sram_set_dest(fc_pci->fc_dev,FC_SRAM_DEST_MEDIA | FC_SRAM_DEST_NET, FC_SRAM_DEST_TARGET_DMA1);
-        flexcop_sram_set_dest(fc_pci->fc_dev,FC_SRAM_DEST_CAO   | FC_SRAM_DEST_CAI, FC_SRAM_DEST_TARGET_DMA2);
-
+        flexcop_sram_set_dest(fc_pci->fc_dev, FC_SRAM_DEST_MEDIA |
+                        FC_SRAM_DEST_NET, FC_SRAM_DEST_TARGET_DMA1);
+        flexcop_sram_set_dest(fc_pci->fc_dev, FC_SRAM_DEST_CAO |
+                        FC_SRAM_DEST_CAI, FC_SRAM_DEST_TARGET_DMA2);
         fc_pci->init_state |= FC_PCI_DMA_INIT;
-
         return ret;
 }
 
@@ -291,12 +297,8 @@ static int flexcop_pci_init(struct flexcop_pci *fc_pci)
 
         if ((ret = pci_enable_device(fc_pci->pdev)) != 0)
                 return ret;
-
         pci_set_master(fc_pci->pdev);
 
-        /* enable interrupts */
-        // pci_write_config_dword(pdev, 0x6c, 0x8000);
-
         if ((ret = pci_request_regions(fc_pci->pdev, DRIVER_NAME)) != 0)
                 goto err_pci_disable_device;
 
@@ -339,8 +341,8 @@ static void flexcop_pci_exit(struct flexcop_pci *fc_pci)
         fc_pci->init_state &= ~FC_PCI_INIT;
 }
 
-
-static int flexcop_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
+static int flexcop_pci_probe(struct pci_dev *pdev,
+                const struct pci_device_id *ent)
 {
         struct flexcop_device *fc;
         struct flexcop_pci *fc_pci;
@@ -351,7 +353,7 @@ static int flexcop_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
                 return -ENOMEM;
         }
 
-/* general flexcop init */
+        /* general flexcop init */
         fc_pci = fc->bus_specific;
         fc_pci->fc_dev = fc;
 
@@ -359,7 +361,6 @@ static int flexcop_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
         fc->write_ibi_reg = flexcop_pci_write_ibi_reg;
         fc->i2c_request = flexcop_i2c_request;
         fc->get_mac_addr = flexcop_eeprom_check_mac_addr;
-
         fc->stream_control = flexcop_pci_stream_control;
 
         if (enable_pid_filtering)
@@ -369,29 +370,29 @@ static int flexcop_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
 
         fc->pid_filtering = enable_pid_filtering;
         fc->bus_type = FC_PCI;
-
         fc->dev = &pdev->dev;
         fc->owner = THIS_MODULE;
 
-/* bus specific part */
+        /* bus specific part */
         fc_pci->pdev = pdev;
         if ((ret = flexcop_pci_init(fc_pci)) != 0)
                 goto err_kfree;
 
-/* init flexcop */
+        /* init flexcop */
         if ((ret = flexcop_device_initialize(fc)) != 0)
                 goto err_pci_exit;
 
-/* init dma */
+        /* init dma */
         if ((ret = flexcop_pci_dma_init(fc_pci)) != 0)
                 goto err_fc_exit;
 
         INIT_DELAYED_WORK(&fc_pci->irq_check_work, flexcop_pci_irq_check_work);
 
-                if (irq_chk_intv > 0)
-                        schedule_delayed_work(&fc_pci->irq_check_work,
-                msecs_to_jiffies(irq_chk_intv < 100 ? 100 : irq_chk_intv));
-
+        if (irq_chk_intv > 0)
+                schedule_delayed_work(&fc_pci->irq_check_work,
+                                msecs_to_jiffies(irq_chk_intv < 100 ?
+                                        100 :
+                                        irq_chk_intv));
         return ret;
 
 err_fc_exit:
@@ -421,7 +422,6 @@ static void flexcop_pci_remove(struct pci_dev *pdev)
 
 static struct pci_device_id flexcop_pci_tbl[] = {
         { PCI_DEVICE(0x13d0, 0x2103) },
-/*      { PCI_DEVICE(0x13d0, 0x2200) }, ? */
         { },
 };
 
diff --git a/drivers/media/dvb/b2c2/flexcop-usb.c b/drivers/media/dvb/b2c2/flexcop-usb.c
index ae0d76a5d51..bedcfb67162 100644
--- a/drivers/media/dvb/b2c2/flexcop-usb.c
+++ b/drivers/media/dvb/b2c2/flexcop-usb.c
@@ -1,11 +1,8 @@
 /*
- * This file is part of linux driver the digital TV devices equipped with B2C2 FlexcopII(b)/III
- *
- * flexcop-usb.c - covers the USB part.
- *
- * see flexcop.c for copyright information.
+ * Linux driver for digital TV devices equipped with B2C2 FlexcopII(b)/III
+ * flexcop-usb.c - covers the USB part
+ * see flexcop.c for copyright information
  */
-
 #define FC_LOG_PREFIX "flexcop_usb"
 #include "flexcop-usb.h"
 #include "flexcop-common.h"
@@ -18,42 +15,47 @@
 /* debug */
 #ifdef CONFIG_DVB_B2C2_FLEXCOP_DEBUG
 #define dprintk(level,args...) \
-            do { if ((debug & level)) { printk(args); } } while (0)
-#define debug_dump(b,l,method) {\
+        do { if ((debug & level)) printk(args); } while (0)
+
+#define debug_dump(b, l, method) do {\
         int i; \
-        for (i = 0; i < l; i++) method("%02x ", b[i]); \
-        method("\n");\
-}
+        for (i = 0; i < l; i++) \
+                method("%02x ", b[i]); \
+        method("\n"); \
+} while (0)
 
 #define DEBSTATUS ""
 #else
-#define dprintk(level,args...)
-#define debug_dump(b,l,method)
+#define dprintk(level, args...)
+#define debug_dump(b, l, method)
 #define DEBSTATUS " (debugging is not enabled)"
 #endif
 
 static int debug;
 module_param(debug, int, 0644);
-MODULE_PARM_DESC(debug, "set debugging level (1=info,ts=2,ctrl=4,i2c=8,v8mem=16 (or-able))." DEBSTATUS);
+MODULE_PARM_DESC(debug, "set debugging level (1=info,ts=2,"
+                "ctrl=4,i2c=8,v8mem=16 (or-able))." DEBSTATUS);
 #undef DEBSTATUS
 
-#define deb_info(args...) dprintk(0x01,args)
-#define deb_ts(args...)   dprintk(0x02,args)
-#define deb_ctrl(args...) dprintk(0x04,args)
-#define deb_i2c(args...)  dprintk(0x08,args)
-#define deb_v8(args...)   dprintk(0x10,args)
+#define deb_info(args...) dprintk(0x01, args)
+#define deb_ts(args...) dprintk(0x02, args)
+#define deb_ctrl(args...) dprintk(0x04, args)
+#define deb_i2c(args...) dprintk(0x08, args)
+#define deb_v8(args...) dprintk(0x10, args)
 
 /* JLP 111700: we will include the 1 bit gap between the upper and lower 3 bits
  * in the IBI address, to make the V8 code simpler.
- * PCI ADDRESS FORMAT: 0x71C -> 0000 0111 0001 1100 (these are the six bits used)
+ * PCI ADDRESS FORMAT: 0x71C -> 0000 0111 0001 1100 (the six bits used)
  *                  in general: 0000 0HHH 000L LL00
  * IBI ADDRESS FORMAT:                    RHHH BLLL
  *
  * where R is the read(1)/write(0) bit, B is the busy bit
  * and HHH and LLL are the two sets of three bits from the PCI address.
  */
-#define B2C2_FLEX_PCIOFFSET_TO_INTERNALADDR(usPCI) (u8) (((usPCI >> 2) & 0x07) + ((usPCI >> 4) & 0x70))
-#define B2C2_FLEX_INTERNALADDR_TO_PCIOFFSET(ucAddr) (u16) (((ucAddr & 0x07) << 2) + ((ucAddr & 0x70) << 4))
+#define B2C2_FLEX_PCIOFFSET_TO_INTERNALADDR(usPCI) (u8) \
+        (((usPCI >> 2) & 0x07) + ((usPCI >> 4) & 0x70))
+#define B2C2_FLEX_INTERNALADDR_TO_PCIOFFSET(ucAddr) (u16) \
+        (((ucAddr & 0x07) << 2) + ((ucAddr & 0x70) << 4))
 
 /*
  * DKT 020228
@@ -69,12 +71,13 @@ static int flexcop_usb_readwrite_dw(struct flexcop_device *fc, u16 wRegOffsPCI,
         struct flexcop_usb *fc_usb = fc->bus_specific;
         u8 request = read ? B2C2_USB_READ_REG : B2C2_USB_WRITE_REG;
         u8 request_type = (read ? USB_DIR_IN : USB_DIR_OUT) | USB_TYPE_VENDOR;
-        u8 wAddress = B2C2_FLEX_PCIOFFSET_TO_INTERNALADDR(wRegOffsPCI) | (read ? 0x80 : 0);
+        u8 wAddress = B2C2_FLEX_PCIOFFSET_TO_INTERNALADDR(wRegOffsPCI) |
+                (read ? 0x80 : 0);
 
         int len = usb_control_msg(fc_usb->udev,
                         read ? B2C2_USB_CTRL_PIPE_IN : B2C2_USB_CTRL_PIPE_OUT,
                         request,
-                        request_type,  /* 0xc0 read or 0x40 write*/
+                        request_type, /* 0xc0 read or 0x40 write */
                         wAddress,
                         0,
                         val,
@@ -82,55 +85,49 @@ static int flexcop_usb_readwrite_dw(struct flexcop_device *fc, u16 wRegOffsPCI,
                         B2C2_WAIT_FOR_OPERATION_RDW * HZ);
 
         if (len != sizeof(u32)) {
-                err("error while %s dword from %d (%d).",read ? "reading" : "writing",
-                        wAddress,wRegOffsPCI);
+                err("error while %s dword from %d (%d).", read ? "reading" :
+                                "writing", wAddress, wRegOffsPCI);
                 return -EIO;
         }
         return 0;
 }
-
 /*
  * DKT 010817 - add support for V8 memory read/write and flash update
  */
 static int flexcop_usb_v8_memory_req(struct flexcop_usb *fc_usb,
                 flexcop_usb_request_t req, u8 page, u16 wAddress,
-                u8 *pbBuffer,u32 buflen)
+                u8 *pbBuffer, u32 buflen)
 {
-//      u8 dwRequestType;
         u8 request_type = USB_TYPE_VENDOR;
         u16 wIndex;
-        int nWaitTime,pipe,len;
-
+        int nWaitTime, pipe, len;
         wIndex = page << 8;
 
         switch (req) {
-                case B2C2_USB_READ_V8_MEM:
-                        nWaitTime = B2C2_WAIT_FOR_OPERATION_V8READ;
-                        request_type |= USB_DIR_IN;
-//                      dwRequestType = (u8) RTYPE_READ_V8_MEMORY;
-                        pipe = B2C2_USB_CTRL_PIPE_IN;
+        case B2C2_USB_READ_V8_MEM:
+                nWaitTime = B2C2_WAIT_FOR_OPERATION_V8READ;
+                request_type |= USB_DIR_IN;
+                pipe = B2C2_USB_CTRL_PIPE_IN;
                 break;
-                case B2C2_USB_WRITE_V8_MEM:
-                        wIndex |= pbBuffer[0];
-                        request_type |= USB_DIR_OUT;
-                        nWaitTime = B2C2_WAIT_FOR_OPERATION_V8WRITE;
-//                      dwRequestType = (u8) RTYPE_WRITE_V8_MEMORY;
-                        pipe = B2C2_USB_CTRL_PIPE_OUT;
+        case B2C2_USB_WRITE_V8_MEM:
+                wIndex |= pbBuffer[0];
+                request_type |= USB_DIR_OUT;
+                nWaitTime = B2C2_WAIT_FOR_OPERATION_V8WRITE;
+                pipe = B2C2_USB_CTRL_PIPE_OUT;
                 break;
-                case B2C2_USB_FLASH_BLOCK:
-                        request_type |= USB_DIR_OUT;
-                        nWaitTime = B2C2_WAIT_FOR_OPERATION_V8FLASH;
-//                      dwRequestType = (u8) RTYPE_WRITE_V8_FLASH;
-                        pipe = B2C2_USB_CTRL_PIPE_OUT;
+        case B2C2_USB_FLASH_BLOCK:
+                request_type |= USB_DIR_OUT;
+                nWaitTime = B2C2_WAIT_FOR_OPERATION_V8FLASH;
+                pipe = B2C2_USB_CTRL_PIPE_OUT;
                 break;
-                default:
-                        deb_info("unsupported request for v8_mem_req %x.\n",req);
+        default:
+                deb_info("unsupported request for v8_mem_req %x.\n", req);
                 return -EINVAL;
         }
-        deb_v8("v8mem: %02x %02x %04x %04x, len: %d\n",request_type,req,
-                        wAddress,wIndex,buflen);
+        deb_v8("v8mem: %02x %02x %04x %04x, len: %d\n", request_type, req,
+                        wAddress, wIndex, buflen);
 
-        len = usb_control_msg(fc_usb->udev,pipe,
+        len = usb_control_msg(fc_usb->udev, pipe,
                         req,
                         request_type,
                         wAddress,
@@ -139,39 +136,53 @@ static int flexcop_usb_v8_memory_req(struct flexcop_usb *fc_usb,
                         buflen,
                         nWaitTime * HZ);
 
-        debug_dump(pbBuffer,len,deb_v8);
-
+        debug_dump(pbBuffer, len, deb_v8);
         return len == buflen ? 0 : -EIO;
 }
 
 #define bytes_left_to_read_on_page(paddr,buflen) \
-                        ((V8_MEMORY_PAGE_SIZE - (paddr & V8_MEMORY_PAGE_MASK)) > buflen \
-                        ? buflen : (V8_MEMORY_PAGE_SIZE - (paddr & V8_MEMORY_PAGE_MASK)))
+        ((V8_MEMORY_PAGE_SIZE - (paddr & V8_MEMORY_PAGE_MASK)) > buflen \
+         ? buflen : (V8_MEMORY_PAGE_SIZE - (paddr & V8_MEMORY_PAGE_MASK)))
 
-static int flexcop_usb_memory_req(struct flexcop_usb *fc_usb,flexcop_usb_request_t req,
-                flexcop_usb_mem_page_t page_start, u32 addr, int extended, u8 *buf, u32 len)
+static int flexcop_usb_memory_req(struct flexcop_usb *fc_usb,
+                flexcop_usb_request_t req, flexcop_usb_mem_page_t page_start,
+                u32 addr, int extended, u8 *buf, u32 len)
 {
         int i,ret = 0;
         u16 wMax;
         u32 pagechunk = 0;
 
         switch(req) {
-                case B2C2_USB_READ_V8_MEM:  wMax = USB_MEM_READ_MAX; break;
-                case B2C2_USB_WRITE_V8_MEM:     wMax = USB_MEM_WRITE_MAX; break;
-                case B2C2_USB_FLASH_BLOCK:  wMax = USB_FLASH_MAX; break;
-                default:
-                        return -EINVAL;
+        case B2C2_USB_READ_V8_MEM:
+                wMax = USB_MEM_READ_MAX;
+                break;
+        case B2C2_USB_WRITE_V8_MEM:
+                wMax = USB_MEM_WRITE_MAX;
+                break;
+        case B2C2_USB_FLASH_BLOCK:
+                wMax = USB_FLASH_MAX;
+                break;
+        default:
+                return -EINVAL;
                 break;
         }
         for (i = 0; i < len;) {
-                pagechunk = wMax < bytes_left_to_read_on_page(addr,len) ? wMax : bytes_left_to_read_on_page(addr,len);
-                deb_info("%x\n",(addr & V8_MEMORY_PAGE_MASK) | (V8_MEMORY_EXTENDED*extended));
-                if ((ret = flexcop_usb_v8_memory_req(fc_usb,req,
-                                page_start + (addr / V8_MEMORY_PAGE_SIZE), /* actual page */
-                                (addr & V8_MEMORY_PAGE_MASK) | (V8_MEMORY_EXTENDED*extended),
-                                &buf[i],pagechunk)) < 0)
+                pagechunk =
+                        wMax < bytes_left_to_read_on_page(addr, len) ?
+                                wMax :
+                                bytes_left_to_read_on_page(addr, len);
+                deb_info("%x\n",
+                        (addr & V8_MEMORY_PAGE_MASK) |
+                                (V8_MEMORY_EXTENDED*extended));
+
+                ret = flexcop_usb_v8_memory_req(fc_usb, req,
+                        page_start + (addr / V8_MEMORY_PAGE_SIZE),
+                        (addr & V8_MEMORY_PAGE_MASK) |
+                                (V8_MEMORY_EXTENDED*extended),
+                        &buf[i], pagechunk);
+
+                if (ret < 0)
                         return ret;
-
                 addr += pagechunk;
                 len -= pagechunk;
         }
@@ -180,8 +191,9 @@ static int flexcop_usb_memory_req(struct flexcop_usb *fc_usb,flexcop_usb_request
 
 static int flexcop_usb_get_mac_addr(struct flexcop_device *fc, int extended)
 {
-        return flexcop_usb_memory_req(fc->bus_specific,B2C2_USB_READ_V8_MEM,
-                        V8_MEMORY_PAGE_FLASH,0x1f010,1,fc->dvb_adapter.proposed_mac,6);
+        return flexcop_usb_memory_req(fc->bus_specific, B2C2_USB_READ_V8_MEM,
+                V8_MEMORY_PAGE_FLASH, 0x1f010, 1,
+                fc->dvb_adapter.proposed_mac, 6);
 }
 
 #if 0
@@ -191,11 +203,8 @@ static int flexcop_usb_utility_req(struct flexcop_usb *fc_usb, int set,
 {
         u16 wValue;
         u8 request_type = (set ? USB_DIR_OUT : USB_DIR_IN) | USB_TYPE_VENDOR;
-//      u8 dwRequestType = (u8) RTYPE_GENERIC,
         int nWaitTime = 2,
-                pipe = set ? B2C2_USB_CTRL_PIPE_OUT : B2C2_USB_CTRL_PIPE_IN,
-                len;
-
+            pipe = set ? B2C2_USB_CTRL_PIPE_OUT : B2C2_USB_CTRL_PIPE_IN, len;
         wValue = (func << 8) | extra;
 
         len = usb_control_msg(fc_usb->udev,pipe,
@@ -218,36 +227,35 @@ static int flexcop_usb_i2c_req(struct flexcop_i2c_adapter *i2c,
         struct flexcop_usb *fc_usb = i2c->fc->bus_specific;
         u16 wValue, wIndex;
         int nWaitTime,pipe,len;
-//      u8 dwRequestType;
         u8 request_type = USB_TYPE_VENDOR;
 
         switch (func) {
-                case USB_FUNC_I2C_WRITE:
-                case USB_FUNC_I2C_MULTIWRITE:
-                case USB_FUNC_I2C_REPEATWRITE:
+        case USB_FUNC_I2C_WRITE:
+        case USB_FUNC_I2C_MULTIWRITE:
+        case USB_FUNC_I2C_REPEATWRITE:
                 /* DKT 020208 - add this to support special case of DiSEqC */
-                case USB_FUNC_I2C_CHECKWRITE:
-                        pipe = B2C2_USB_CTRL_PIPE_OUT;
-                        nWaitTime = 2;
-//                      dwRequestType = (u8) RTYPE_GENERIC;
-                        request_type |= USB_DIR_OUT;
+        case USB_FUNC_I2C_CHECKWRITE:
+                pipe = B2C2_USB_CTRL_PIPE_OUT;
+                nWaitTime = 2;
+                request_type |= USB_DIR_OUT;
                 break;
-                case USB_FUNC_I2C_READ:
-                case USB_FUNC_I2C_REPEATREAD:
-                        pipe = B2C2_USB_CTRL_PIPE_IN;
-                        nWaitTime = 2;
-//                      dwRequestType = (u8) RTYPE_GENERIC;
-                        request_type |= USB_DIR_IN;
+        case USB_FUNC_I2C_READ:
+        case USB_FUNC_I2C_REPEATREAD:
+                pipe = B2C2_USB_CTRL_PIPE_IN;
+                nWaitTime = 2;
+                request_type |= USB_DIR_IN;
                 break;
-                default:
-                        deb_info("unsupported function for i2c_req %x\n",func);
-                        return -EINVAL;
+        default:
+                deb_info("unsupported function for i2c_req %x\n", func);
+                return -EINVAL;
         }
         wValue = (func << 8) | (i2c->port << 4);
         wIndex = (chipaddr << 8 ) | addr;
 
-        deb_i2c("i2c %2d: %02x %02x %02x %02x %02x %02x\n",func,request_type,req,
-                wValue & 0xff, wValue >> 8, wIndex & 0xff, wIndex >> 8);
+        deb_i2c("i2c %2d: %02x %02x %02x %02x %02x %02x\n",
+                        func, request_type, req,
+                        wValue & 0xff, wValue >> 8,
+                        wIndex & 0xff, wIndex >> 8);
 
         len = usb_control_msg(fc_usb->udev,pipe,
                         req,
@@ -257,44 +265,49 @@ static int flexcop_usb_i2c_req(struct flexcop_i2c_adapter *i2c,
                         buf,
                         buflen,
                         nWaitTime * HZ);
-
         return len == buflen ? 0 : -EREMOTEIO;
 }
 
-/* actual bus specific access functions, make sure prototype are/will be equal to pci */
-static flexcop_ibi_value flexcop_usb_read_ibi_reg(struct flexcop_device *fc, flexcop_ibi_register reg)
+/* actual bus specific access functions,
+   make sure prototype are/will be equal to pci */
+static flexcop_ibi_value flexcop_usb_read_ibi_reg(struct flexcop_device *fc,
+        flexcop_ibi_register reg)
 {
         flexcop_ibi_value val;
         val.raw = 0;
-        flexcop_usb_readwrite_dw(fc,reg, &val.raw, 1);
+        flexcop_usb_readwrite_dw(fc, reg, &val.raw, 1);
         return val;
 }
 
-static int flexcop_usb_write_ibi_reg(struct flexcop_device *fc, flexcop_ibi_register reg, flexcop_ibi_value val)
+static int flexcop_usb_write_ibi_reg(struct flexcop_device *fc,
+                flexcop_ibi_register reg, flexcop_ibi_value val)
 {
-        return flexcop_usb_readwrite_dw(fc,reg, &val.raw, 0);
+        return flexcop_usb_readwrite_dw(fc, reg, &val.raw, 0);
 }
 
 static int flexcop_usb_i2c_request(struct flexcop_i2c_adapter *i2c,
-        flexcop_access_op_t op, u8 chipaddr, u8 addr, u8 *buf, u16 len)
+                flexcop_access_op_t op, u8 chipaddr, u8 addr, u8 *buf, u16 len)
 {
         if (op == FC_READ)
                 return flexcop_usb_i2c_req(i2c, B2C2_USB_I2C_REQUEST,
-                        USB_FUNC_I2C_READ, chipaddr, addr, buf, len);
+                                USB_FUNC_I2C_READ, chipaddr, addr, buf, len);
         else
                 return flexcop_usb_i2c_req(i2c, B2C2_USB_I2C_REQUEST,
-                        USB_FUNC_I2C_WRITE, chipaddr, addr, buf, len);
+                                USB_FUNC_I2C_WRITE, chipaddr, addr, buf, len);
 }
 
-static void flexcop_usb_process_frame(struct flexcop_usb *fc_usb, u8 *buffer, int buffer_length)
+static void flexcop_usb_process_frame(struct flexcop_usb *fc_usb,
+        u8 *buffer, int buffer_length)
 {
         u8 *b;
         int l;
 
-        deb_ts("tmp_buffer_length=%d, buffer_length=%d\n", fc_usb->tmp_buffer_length, buffer_length);
+        deb_ts("tmp_buffer_length=%d, buffer_length=%d\n",
+                fc_usb->tmp_buffer_length, buffer_length);
 
         if (fc_usb->tmp_buffer_length > 0) {
-                memcpy(fc_usb->tmp_buffer+fc_usb->tmp_buffer_length, buffer, buffer_length);
+                memcpy(fc_usb->tmp_buffer+fc_usb->tmp_buffer_length, buffer,
+                                buffer_length);
                 fc_usb->tmp_buffer_length += buffer_length;
                 b = fc_usb->tmp_buffer;
                 l = fc_usb->tmp_buffer_length;
@@ -304,23 +317,26 @@ static void flexcop_usb_process_frame(struct flexcop_usb *fc_usb, u8 *buffer, in
         }
 
         while (l >= 190) {
-                if (*b == 0xff)
+                if (*b == 0xff) {
                         switch (*(b+1) & 0x03) {
-                                case 0x01: /* media packet */
-                                        if ( *(b+2) == 0x47 )
-                                                flexcop_pass_dmx_packets(fc_usb->fc_dev, b+2, 1);
-                                        else
-                                                deb_ts("not ts packet %02x %02x %02x %02x \n", *(b+2), *(b+3), *(b+4), *(b+5) );
-
-                                        b += 190;
-                                        l -= 190;
+                        case 0x01: /* media packet */
+                                if (*(b+2) == 0x47)
+                                        flexcop_pass_dmx_packets(
+                                                        fc_usb->fc_dev, b+2, 1);
+                                else
+                                        deb_ts(
+                                        "not ts packet %02x %02x %02x %02x \n",
+                                                *(b+2), *(b+3),
+                                                *(b+4), *(b+5));
+                                b += 190;
+                                l -= 190;
                                 break;
-                                default:
-                                        deb_ts("wrong packet type\n");
-                                        l = 0;
+                        default:
+                                deb_ts("wrong packet type\n");
+                                l = 0;
                                 break;
                         }
-                else {
+                } else {
                         deb_ts("wrong header\n");
                         l = 0;
                 }
@@ -337,23 +353,26 @@ static void flexcop_usb_urb_complete(struct urb *urb)
         int i;
 
         if (urb->actual_length > 0)
-                deb_ts("urb completed, bufsize: %d actlen; %d\n",urb->transfer_buffer_length, urb->actual_length);
+                deb_ts("urb completed, bufsize: %d actlen; %d\n",
+                        urb->transfer_buffer_length, urb->actual_length);
 
         for (i = 0; i < urb->number_of_packets; i++) {
                 if (urb->iso_frame_desc[i].status < 0) {
-                        err("iso frame descriptor %d has an error: %d\n",i,urb->iso_frame_desc[i].status);
+                        err("iso frame descriptor %d has an error: %d\n", i,
+                                urb->iso_frame_desc[i].status);
                 } else
                         if (urb->iso_frame_desc[i].actual_length > 0) {
-                                deb_ts("passed %d bytes to the demux\n",urb->iso_frame_desc[i].actual_length);
+                                deb_ts("passed %d bytes to the demux\n",
+                                        urb->iso_frame_desc[i].actual_length);
 
                                 flexcop_usb_process_frame(fc_usb,
-                                        urb->transfer_buffer + urb->iso_frame_desc[i].offset,
+                                        urb->transfer_buffer +
+                                                urb->iso_frame_desc[i].offset,
                                         urb->iso_frame_desc[i].actual_length);
-                }
+                        }
                 urb->iso_frame_desc[i].status = 0;
                 urb->iso_frame_desc[i].actual_length = 0;
         }
-
         usb_submit_urb(urb,GFP_ATOMIC);
 }
 
@@ -374,35 +393,47 @@ static void flexcop_usb_transfer_exit(struct flexcop_usb *fc_usb)
                 }
 
         if (fc_usb->iso_buffer != NULL)
-                pci_free_consistent(NULL,fc_usb->buffer_size, fc_usb->iso_buffer, fc_usb->dma_addr);
+                pci_free_consistent(NULL,
+                        fc_usb->buffer_size, fc_usb->iso_buffer,
+                        fc_usb->dma_addr);
 }
 
 static int flexcop_usb_transfer_init(struct flexcop_usb *fc_usb)
 {
-        u16 frame_size = le16_to_cpu(fc_usb->uintf->cur_altsetting->endpoint[0].desc.wMaxPacketSize);
-        int bufsize = B2C2_USB_NUM_ISO_URB * B2C2_USB_FRAMES_PER_ISO * frame_size,i,j,ret;
+        u16 frame_size = le16_to_cpu(
+                fc_usb->uintf->cur_altsetting->endpoint[0].desc.wMaxPacketSize);
+        int bufsize = B2C2_USB_NUM_ISO_URB * B2C2_USB_FRAMES_PER_ISO *
+                frame_size, i, j, ret;
         int buffer_offset = 0;
 
-        deb_ts("creating %d iso-urbs with %d frames each of %d bytes size = %d.\n",
-                        B2C2_USB_NUM_ISO_URB, B2C2_USB_FRAMES_PER_ISO, frame_size,bufsize);
+        deb_ts("creating %d iso-urbs with %d frames "
+                        "each of %d bytes size = %d.\n", B2C2_USB_NUM_ISO_URB,
+                        B2C2_USB_FRAMES_PER_ISO, frame_size, bufsize);
 
-        fc_usb->iso_buffer = pci_alloc_consistent(NULL,bufsize,&fc_usb->dma_addr);
+        fc_usb->iso_buffer = pci_alloc_consistent(NULL,
+                        bufsize, &fc_usb->dma_addr);
         if (fc_usb->iso_buffer == NULL)
                 return -ENOMEM;
+
         memset(fc_usb->iso_buffer, 0, bufsize);
         fc_usb->buffer_size = bufsize;
 
         /* creating iso urbs */
-        for (i = 0; i < B2C2_USB_NUM_ISO_URB; i++)
-                if (!(fc_usb->iso_urb[i] = usb_alloc_urb(B2C2_USB_FRAMES_PER_ISO,GFP_ATOMIC))) {
+        for (i = 0; i < B2C2_USB_NUM_ISO_URB; i++) {
+                fc_usb->iso_urb[i] = usb_alloc_urb(B2C2_USB_FRAMES_PER_ISO,
+                        GFP_ATOMIC);
+                if (fc_usb->iso_urb[i] == NULL) {
                         ret = -ENOMEM;
                         goto urb_error;
                 }
+        }
+
         /* initialising and submitting iso urbs */
         for (i = 0; i < B2C2_USB_NUM_ISO_URB; i++) {
                 int frame_offset = 0;
                 struct urb *urb = fc_usb->iso_urb[i];
-                deb_ts("initializing and submitting urb no. %d (buf_offset: %d).\n",i,buffer_offset);
+                deb_ts("initializing and submitting urb no. %d "
+                        "(buf_offset: %d).\n", i, buffer_offset);
 
                 urb->dev = fc_usb->udev;
                 urb->context = fc_usb;
@@ -416,26 +447,26 @@ static int flexcop_usb_transfer_init(struct flexcop_usb *fc_usb)
 
                 buffer_offset += frame_size * B2C2_USB_FRAMES_PER_ISO;
                 for (j = 0; j < B2C2_USB_FRAMES_PER_ISO; j++) {
-                        deb_ts("urb no: %d, frame: %d, frame_offset: %d\n",i,j,frame_offset);
+                        deb_ts("urb no: %d, frame: %d, frame_offset: %d\n",
+                                        i, j, frame_offset);
                         urb->iso_frame_desc[j].offset = frame_offset;
                         urb->iso_frame_desc[j].length = frame_size;
                         frame_offset += frame_size;
                 }
 
                 if ((ret = usb_submit_urb(fc_usb->iso_urb[i],GFP_ATOMIC))) {
-                        err("submitting urb %d failed with %d.",i,ret);
+                        err("submitting urb %d failed with %d.", i, ret);
                         goto urb_error;
                 }
                 deb_ts("submitted urb no. %d.\n",i);
         }
 
-/* SRAM */
-
-        flexcop_sram_set_dest(fc_usb->fc_dev,FC_SRAM_DEST_MEDIA | FC_SRAM_DEST_NET |
-                        FC_SRAM_DEST_CAO | FC_SRAM_DEST_CAI, FC_SRAM_DEST_TARGET_WAN_USB);
-        flexcop_wan_set_speed(fc_usb->fc_dev,FC_WAN_SPEED_8MBITS);
-        flexcop_sram_ctrl(fc_usb->fc_dev,1,1,1);
-
+        /* SRAM */
+        flexcop_sram_set_dest(fc_usb->fc_dev, FC_SRAM_DEST_MEDIA |
+                        FC_SRAM_DEST_NET | FC_SRAM_DEST_CAO | FC_SRAM_DEST_CAI,
+                        FC_SRAM_DEST_TARGET_WAN_USB);
+        flexcop_wan_set_speed(fc_usb->fc_dev, FC_WAN_SPEED_8MBITS);
+        flexcop_sram_ctrl(fc_usb->fc_dev, 1, 1, 1);
         return 0;
 
 urb_error:
@@ -448,20 +479,20 @@ static int flexcop_usb_init(struct flexcop_usb *fc_usb)
         /* use the alternate setting with the larges buffer */
         usb_set_interface(fc_usb->udev,0,1);
         switch (fc_usb->udev->speed) {
-                case USB_SPEED_LOW:
-                        err("cannot handle USB speed because it is to sLOW.");
-                        return -ENODEV;
-                        break;
-                case USB_SPEED_FULL:
-                        info("running at FULL speed.");
-                        break;
-                case USB_SPEED_HIGH:
-                        info("running at HIGH speed.");
-                        break;
-                case USB_SPEED_UNKNOWN: /* fall through */
-                default:
-                        err("cannot handle USB speed because it is unkown.");
-                        return -ENODEV;
+        case USB_SPEED_LOW:
+                err("cannot handle USB speed because it is too slow.");
+                return -ENODEV;
+                break;
+        case USB_SPEED_FULL:
+                info("running at FULL speed.");
+                break;
+        case USB_SPEED_HIGH:
+                info("running at HIGH speed.");
+                break;
+        case USB_SPEED_UNKNOWN: /* fall through */
+        default:
+                err("cannot handle USB speed because it is unknown.");
+                return -ENODEV;
         }
         usb_set_intfdata(fc_usb->uintf, fc_usb);
         return 0;
@@ -485,7 +516,7 @@ static int flexcop_usb_probe(struct usb_interface *intf,
                 return -ENOMEM;
         }
 
-/* general flexcop init */
+        /* general flexcop init */
         fc_usb = fc->bus_specific;
         fc_usb->fc_dev = fc;
 
@@ -502,21 +533,21 @@ static int flexcop_usb_probe(struct usb_interface *intf,
         fc->dev = &udev->dev;
         fc->owner = THIS_MODULE;
 
-/* bus specific part */
+        /* bus specific part */
         fc_usb->udev = udev;
         fc_usb->uintf = intf;
         if ((ret = flexcop_usb_init(fc_usb)) != 0)
                 goto err_kfree;
 
-/* init flexcop */
+        /* init flexcop */
         if ((ret = flexcop_device_initialize(fc)) != 0)
                 goto err_usb_exit;
 
-/* xfer init */
+        /* xfer init */
         if ((ret = flexcop_usb_transfer_init(fc_usb)) != 0)
                 goto err_fc_exit;
 
-        info("%s successfully initialized and connected.",DRIVER_NAME);
+        info("%s successfully initialized and connected.", DRIVER_NAME);
         return 0;
 
 err_fc_exit:
@@ -535,12 +566,12 @@ static void flexcop_usb_disconnect(struct usb_interface *intf)
         flexcop_device_exit(fc_usb->fc_dev);
         flexcop_usb_exit(fc_usb);
         flexcop_device_kfree(fc_usb->fc_dev);
-        info("%s successfully deinitialized and disconnected.",DRIVER_NAME);
+        info("%s successfully deinitialized and disconnected.", DRIVER_NAME);
 }
 
 static struct usb_device_id flexcop_usb_table [] = {
-            { USB_DEVICE(0x0af7, 0x0101) },
-            { }
+        { USB_DEVICE(0x0af7, 0x0101) },
+        { }
 };
 MODULE_DEVICE_TABLE (usb, flexcop_usb_table);
 
@@ -557,10 +588,9 @@ static int __init flexcop_usb_module_init(void)
 {
         int result;
         if ((result = usb_register(&flexcop_usb_driver))) {
-                err("usb_register failed. (%d)",result);
+                err("usb_register failed. (%d)", result);
                 return result;
         }
-
         return 0;
 }