]> git.karo-electronics.de Git - mv-sheeva.git/blobdiff - drivers/isdn/hisax/hfc_usb.c
isdn: whitespace coding style cleanup
[mv-sheeva.git] / drivers / isdn / hisax / hfc_usb.c
index f407de0e006d19edd00cd525318bee6930607551..62c65bdefd8a0d2f7100197b0b5116133205a45d 100644 (file)
@@ -27,7 +27,7 @@
  *
  * See Version Histroy at the bottom of this file
  *
-*/
+ */
 
 #include <linux/types.h>
 #include <linux/stddef.h>
 #include "hfc_usb.h"
 
 static const char *hfcusb_revision =
-    "$Revision: 2.3.2.24 $ $Date: 2007/10/14 08:40:29 $ ";
+       "$Revision: 2.3.2.24 $ $Date: 2007/10/14 08:40:29 $ ";
 
 /* Hisax debug support
-*  debug flags defined in hfc_usb.h as HFCUSB_DBG_[*]
-*/
+ *  debug flags defined in hfc_usb.h as HFCUSB_DBG_[*]
+ */
 #define __debug_variable hfc_debug
 #include "hisax_debug.h"
 static u_int debug;
@@ -67,70 +67,70 @@ typedef struct {
 /* VID/PID device list */
 static struct usb_device_id hfcusb_idtab[] = {
        {
-        USB_DEVICE(0x0959, 0x2bd0),
-        .driver_info = (unsigned long) &((hfcsusb_vdata)
-                         {LED_OFF, {4, 0, 2, 1},
-                          "ISDN USB TA (Cologne Chip HFC-S USB based)"}),
+               USB_DEVICE(0x0959, 0x2bd0),
+               .driver_info = (unsigned long) &((hfcsusb_vdata)
+                       {LED_OFF, {4, 0, 2, 1},
+                                       "ISDN USB TA (Cologne Chip HFC-S USB based)"}),
        },
        {
-        USB_DEVICE(0x0675, 0x1688),
-        .driver_info = (unsigned long) &((hfcsusb_vdata)
-                         {LED_SCHEME1, {1, 2, 0, 0},
-                          "DrayTek miniVigor 128 USB ISDN TA"}),
+               USB_DEVICE(0x0675, 0x1688),
+               .driver_info = (unsigned long) &((hfcsusb_vdata)
+                       {LED_SCHEME1, {1, 2, 0, 0},
+                                       "DrayTek miniVigor 128 USB ISDN TA"}),
        },
        {
-        USB_DEVICE(0x07b0, 0x0007),
-        .driver_info = (unsigned long) &((hfcsusb_vdata)
-                         {LED_SCHEME1, {0x80, -64, -32, -16},
-                          "Billion tiny USB ISDN TA 128"}),
+               USB_DEVICE(0x07b0, 0x0007),
+               .driver_info = (unsigned long) &((hfcsusb_vdata)
+                       {LED_SCHEME1, {0x80, -64, -32, -16},
+                                       "Billion tiny USB ISDN TA 128"}),
        },
        {
-        USB_DEVICE(0x0742, 0x2008),
-        .driver_info = (unsigned long) &((hfcsusb_vdata)
-                         {LED_SCHEME1, {4, 0, 2, 1},
-                          "Stollmann USB TA"}),
+               USB_DEVICE(0x0742, 0x2008),
+               .driver_info = (unsigned long) &((hfcsusb_vdata)
+                       {LED_SCHEME1, {4, 0, 2, 1},
+                                       "Stollmann USB TA"}),
        },
        {
-        USB_DEVICE(0x0742, 0x2009),
-        .driver_info = (unsigned long) &((hfcsusb_vdata)
-                         {LED_SCHEME1, {4, 0, 2, 1},
-                          "Aceex USB ISDN TA"}),
+               USB_DEVICE(0x0742, 0x2009),
+               .driver_info = (unsigned long) &((hfcsusb_vdata)
+                       {LED_SCHEME1, {4, 0, 2, 1},
+                                       "Aceex USB ISDN TA"}),
        },
        {
-        USB_DEVICE(0x0742, 0x200A),
-        .driver_info = (unsigned long) &((hfcsusb_vdata)
-                         {LED_SCHEME1, {4, 0, 2, 1},
-                          "OEM USB ISDN TA"}),
+               USB_DEVICE(0x0742, 0x200A),
+               .driver_info = (unsigned long) &((hfcsusb_vdata)
+                       {LED_SCHEME1, {4, 0, 2, 1},
+                                       "OEM USB ISDN TA"}),
        },
        {
-        USB_DEVICE(0x08e3, 0x0301),
-        .driver_info = (unsigned long) &((hfcsusb_vdata)
-                         {LED_SCHEME1, {2, 0, 1, 4},
-                          "Olitec USB RNIS"}),
+               USB_DEVICE(0x08e3, 0x0301),
+               .driver_info = (unsigned long) &((hfcsusb_vdata)
+                       {LED_SCHEME1, {2, 0, 1, 4},
+                                       "Olitec USB RNIS"}),
        },
        {
-        USB_DEVICE(0x07fa, 0x0846),
-        .driver_info = (unsigned long) &((hfcsusb_vdata)
-                         {LED_SCHEME1, {0x80, -64, -32, -16},
-                          "Bewan Modem RNIS USB"}),
+               USB_DEVICE(0x07fa, 0x0846),
+               .driver_info = (unsigned long) &((hfcsusb_vdata)
+                       {LED_SCHEME1, {0x80, -64, -32, -16},
+                                       "Bewan Modem RNIS USB"}),
        },
        {
-        USB_DEVICE(0x07fa, 0x0847),
-        .driver_info = (unsigned long) &((hfcsusb_vdata)
-                         {LED_SCHEME1, {0x80, -64, -32, -16},
-                          "Djinn Numeris USB"}),
+               USB_DEVICE(0x07fa, 0x0847),
+               .driver_info = (unsigned long) &((hfcsusb_vdata)
+                       {LED_SCHEME1, {0x80, -64, -32, -16},
+                                       "Djinn Numeris USB"}),
        },
        {
-        USB_DEVICE(0x07b0, 0x0006),
-        .driver_info = (unsigned long) &((hfcsusb_vdata)
-                         {LED_SCHEME1, {0x80, -64, -32, -16},
-                          "Twister ISDN TA"}),
+               USB_DEVICE(0x07b0, 0x0006),
+               .driver_info = (unsigned long) &((hfcsusb_vdata)
+                       {LED_SCHEME1, {0x80, -64, -32, -16},
+                                       "Twister ISDN TA"}),
        },
        {
-        USB_DEVICE(0x071d, 0x1005),
-        .driver_info = (unsigned long) &((hfcsusb_vdata)
-                         {LED_SCHEME1, {0x02, 0, 0x01, 0x04},
-                          "Eicon DIVA USB 4.0"}),
+               USB_DEVICE(0x071d, 0x1005),
+               .driver_info = (unsigned long) &((hfcsusb_vdata)
+                       {LED_SCHEME1, {0x02, 0, 0x01, 0x04},
+                                       "Eicon DIVA USB 4.0"}),
        },
        { }
 };
@@ -177,7 +177,7 @@ typedef struct hfcusb_data {
        int alt_used;           /* used alternate config */
        int ctrl_paksize;       /* control pipe packet size */
        int ctrl_in_pipe,       /* handles for control pipe */
-           ctrl_out_pipe;
+               ctrl_out_pipe;
        int cfg_used;           /* configuration index used */
        int vend_idx;           /* vendor found */
        int b_mode[2];          /* B-channel mode */
@@ -206,7 +206,7 @@ typedef struct hfcusb_data {
 } hfcusb_data;
 
 
-static void collect_rx_frame(usb_fifo * fifo, __u8 * data, int len,
+static void collect_rx_frame(usb_fifo *fifo, __u8 *data, int len,
                             int finish);
 
 static inline const char *
@@ -220,24 +220,24 @@ symbolic(struct hfcusb_symbolic_list list[], const int num)
 }
 
 static void
-ctrl_start_transfer(hfcusb_data * hfc)
+ctrl_start_transfer(hfcusb_data *hfc)
 {
        if (hfc->ctrl_cnt) {
                hfc->ctrl_urb->pipe = hfc->ctrl_out_pipe;
-               hfc->ctrl_urb->setup_packet = (u_char *) & hfc->ctrl_write;
+               hfc->ctrl_urb->setup_packet = (u_char *)&hfc->ctrl_write;
                hfc->ctrl_urb->transfer_buffer = NULL;
                hfc->ctrl_urb->transfer_buffer_length = 0;
                hfc->ctrl_write.wIndex =
-                   cpu_to_le16(hfc->ctrl_buff[hfc->ctrl_out_idx].hfc_reg);
+                       cpu_to_le16(hfc->ctrl_buff[hfc->ctrl_out_idx].hfc_reg);
                hfc->ctrl_write.wValue =
-                   cpu_to_le16(hfc->ctrl_buff[hfc->ctrl_out_idx].reg_val);
+                       cpu_to_le16(hfc->ctrl_buff[hfc->ctrl_out_idx].reg_val);
 
                usb_submit_urb(hfc->ctrl_urb, GFP_ATOMIC);      /* start transfer */
        }
 }                              /* ctrl_start_transfer */
 
 static int
-queue_control_request(hfcusb_data * hfc, __u8 reg, __u8 val, int action)
+queue_control_request(hfcusb_data *hfc, __u8 reg, __u8 val, int action)
 {
        ctrl_buft *buf;
 
@@ -271,7 +271,7 @@ ctrl_complete(struct urb *urb)
 
 /* write led data to auxport & invert if necessary */
 static void
-write_led(hfcusb_data * hfc, __u8 led_state)
+write_led(hfcusb_data *hfc, __u8 led_state)
 {
        if (led_state != hfc->old_led_state) {
                hfc->old_led_state = led_state;
@@ -280,7 +280,7 @@ write_led(hfcusb_data * hfc, __u8 led_state)
 }
 
 static void
-set_led_bit(hfcusb_data * hfc, signed short led_bits, int on)
+set_led_bit(hfcusb_data *hfc, signed short led_bits, int on)
 {
        if (on) {
                if (led_bits < 0)
@@ -297,53 +297,53 @@ set_led_bit(hfcusb_data * hfc, signed short led_bits, int on)
 
 /* handle LED requests */
 static void
-handle_led(hfcusb_data * hfc, int event)
+handle_led(hfcusb_data *hfc, int event)
 {
        hfcsusb_vdata *driver_info =
-           (hfcsusb_vdata *) hfcusb_idtab[hfc->vend_idx].driver_info;
+               (hfcsusb_vdata *) hfcusb_idtab[hfc->vend_idx].driver_info;
 
        /* if no scheme -> no LED action */
        if (driver_info->led_scheme == LED_OFF)
                return;
 
        switch (event) {
-               case LED_POWER_ON:
-                       set_led_bit(hfc, driver_info->led_bits[0], 1);
-                       set_led_bit(hfc, driver_info->led_bits[1], 0);
-                       set_led_bit(hfc, driver_info->led_bits[2], 0);
-                       set_led_bit(hfc, driver_info->led_bits[3], 0);
-                       break;
-               case LED_POWER_OFF:
-                       set_led_bit(hfc, driver_info->led_bits[0], 0);
-                       set_led_bit(hfc, driver_info->led_bits[1], 0);
-                       set_led_bit(hfc, driver_info->led_bits[2], 0);
-                       set_led_bit(hfc, driver_info->led_bits[3], 0);
-                       break;
-               case LED_S0_ON:
-                       set_led_bit(hfc, driver_info->led_bits[1], 1);
-                       break;
-               case LED_S0_OFF:
-                       set_led_bit(hfc, driver_info->led_bits[1], 0);
-                       break;
-               case LED_B1_ON:
-                       set_led_bit(hfc, driver_info->led_bits[2], 1);
-                       break;
-               case LED_B1_OFF:
-                       set_led_bit(hfc, driver_info->led_bits[2], 0);
-                       break;
-               case LED_B2_ON:
-                       set_led_bit(hfc, driver_info->led_bits[3], 1);
-                       break;
-               case LED_B2_OFF:
-                       set_led_bit(hfc, driver_info->led_bits[3], 0);
-                       break;
+       case LED_POWER_ON:
+               set_led_bit(hfc, driver_info->led_bits[0], 1);
+               set_led_bit(hfc, driver_info->led_bits[1], 0);
+               set_led_bit(hfc, driver_info->led_bits[2], 0);
+               set_led_bit(hfc, driver_info->led_bits[3], 0);
+               break;
+       case LED_POWER_OFF:
+               set_led_bit(hfc, driver_info->led_bits[0], 0);
+               set_led_bit(hfc, driver_info->led_bits[1], 0);
+               set_led_bit(hfc, driver_info->led_bits[2], 0);
+               set_led_bit(hfc, driver_info->led_bits[3], 0);
+               break;
+       case LED_S0_ON:
+               set_led_bit(hfc, driver_info->led_bits[1], 1);
+               break;
+       case LED_S0_OFF:
+               set_led_bit(hfc, driver_info->led_bits[1], 0);
+               break;
+       case LED_B1_ON:
+               set_led_bit(hfc, driver_info->led_bits[2], 1);
+               break;
+       case LED_B1_OFF:
+               set_led_bit(hfc, driver_info->led_bits[2], 0);
+               break;
+       case LED_B2_ON:
+               set_led_bit(hfc, driver_info->led_bits[3], 1);
+               break;
+       case LED_B2_OFF:
+               set_led_bit(hfc, driver_info->led_bits[3], 0);
+               break;
        }
        write_led(hfc, hfc->led_state);
 }
 
 /* ISDN l1 timer T3 expires */
 static void
-l1_timer_expire_t3(hfcusb_data * hfc)
+l1_timer_expire_t3(hfcusb_data *hfc)
 {
        hfc->d_if.ifc.l1l2(&hfc->d_if.ifc, PH_DEACTIVATE | INDICATION,
                           NULL);
@@ -360,7 +360,7 @@ l1_timer_expire_t3(hfcusb_data * hfc)
 
 /* ISDN l1 timer T4 expires */
 static void
-l1_timer_expire_t4(hfcusb_data * hfc)
+l1_timer_expire_t4(hfcusb_data *hfc)
 {
        hfc->d_if.ifc.l1l2(&hfc->d_if.ifc, PH_DEACTIVATE | INDICATION,
                           NULL);
@@ -374,7 +374,7 @@ l1_timer_expire_t4(hfcusb_data * hfc)
 
 /* S0 state changed */
 static void
-s0_state_handler(hfcusb_data * hfc, __u8 state)
+s0_state_handler(hfcusb_data *hfc, __u8 state)
 {
        __u8 old_state;
 
@@ -402,12 +402,12 @@ s0_state_handler(hfcusb_data * hfc, __u8 state)
                DBG(HFCUSB_DBG_STATES, "HFC-S USB: PH_ACTIVATE | INDICATION sent");
                hfc->l1_activated = 1;
                handle_led(hfc, LED_S0_ON);
-       } else if (state <= 3 /* && activated */ ) {
+       } else if (state <= 3 /* && activated */) {
                if (old_state == 7 || old_state == 8) {
                        DBG(HFCUSB_DBG_STATES, "HFC-S USB: T4 activated");
                        if (!timer_pending(&hfc->t4_timer)) {
                                hfc->t4_timer.expires =
-                                   jiffies + (HFC_TIMER_T4 * HZ) / 1000;
+                                       jiffies + (HFC_TIMER_T4 * HZ) / 1000;
                                add_timer(&hfc->t4_timer);
                        }
                } else {
@@ -451,7 +451,7 @@ fill_isoc_urb(struct urb *urb, struct usb_device *dev, unsigned int pipe,
  * gaps in the transfer chain
  */
 static int
-start_isoc_chain(usb_fifo * fifo, int num_packets_per_urb,
+start_isoc_chain(usb_fifo *fifo, int num_packets_per_urb,
                 usb_complete_t complete, int packet_size)
 {
        int i, k, errcode;
@@ -463,7 +463,7 @@ start_isoc_chain(usb_fifo * fifo, int num_packets_per_urb,
        for (i = 0; i < 2; i++) {
                if (!(fifo->iso[i].purb)) {
                        fifo->iso[i].purb =
-                           usb_alloc_urb(num_packets_per_urb, GFP_KERNEL);
+                               usb_alloc_urb(num_packets_per_urb, GFP_KERNEL);
                        if (!(fifo->iso[i].purb)) {
                                printk(KERN_INFO
                                       "alloc urb for fifo %i failed!!!",
@@ -487,11 +487,11 @@ start_isoc_chain(usb_fifo * fifo, int num_packets_per_urb,
                                /* defining packet delimeters in fifo->buffer */
                                for (k = 0; k < num_packets_per_urb; k++) {
                                        fifo->iso[i].purb->
-                                           iso_frame_desc[k].offset =
-                                           k * packet_size;
+                                               iso_frame_desc[k].offset =
+                                               k * packet_size;
                                        fifo->iso[i].purb->
-                                           iso_frame_desc[k].length =
-                                           packet_size;
+                                               iso_frame_desc[k].length =
+                                               packet_size;
                                }
                        } else {
                                printk(KERN_INFO
@@ -511,7 +511,7 @@ start_isoc_chain(usb_fifo * fifo, int num_packets_per_urb,
 
 /* stops running iso chain and frees their pending urbs */
 static void
-stop_isoc_chain(usb_fifo * fifo)
+stop_isoc_chain(usb_fifo *fifo)
 {
        int i;
 
@@ -534,8 +534,8 @@ stop_isoc_chain(usb_fifo * fifo)
 
 /* defines how much ISO packets are handled in one URB */
 static int iso_packets[8] =
-    { ISOC_PACKETS_B, ISOC_PACKETS_B, ISOC_PACKETS_B, ISOC_PACKETS_B,
-       ISOC_PACKETS_D, ISOC_PACKETS_D, ISOC_PACKETS_D, ISOC_PACKETS_D
+{ ISOC_PACKETS_B, ISOC_PACKETS_B, ISOC_PACKETS_B, ISOC_PACKETS_B,
+  ISOC_PACKETS_D, ISOC_PACKETS_D, ISOC_PACKETS_D, ISOC_PACKETS_D
 };
 
 static void
@@ -545,7 +545,7 @@ tx_iso_complete(struct urb *urb)
        usb_fifo *fifo = context_iso_urb->owner_fifo;
        hfcusb_data *hfc = fifo->hfc;
        int k, tx_offset, num_isoc_packets, sink, len, current_len,
-           errcode;
+               errcode;
        int frame_complete, transp_mode, fifon, status;
        __u8 threshbit;
 
@@ -565,8 +565,8 @@ tx_iso_complete(struct urb *urb)
                        errcode = urb->iso_frame_desc[k].status;
                        if (errcode)
                                DBG(HFCUSB_DBG_VERBOSE_USB, "HFC-S USB: tx_iso_complete "
-                                      "packet %i, status: %i\n",
-                                      k, errcode);
+                                   "packet %i, status: %i\n",
+                                   k, errcode);
                }
 
                // clear status, so go on with ISO transfers
@@ -607,8 +607,8 @@ tx_iso_complete(struct urb *urb)
                                if (current_len > 14)
                                        current_len = 14;
                                current_len =
-                                   (len <=
-                                    current_len) ? len : current_len;
+                                       (len <=
+                                        current_len) ? len : current_len;
                                /* how much bit do we put on the line? */
                                fifo->bit_line += current_len * 8;
 
@@ -617,7 +617,7 @@ tx_iso_complete(struct urb *urb)
                                        if (!transp_mode) {
                                                /* here frame completion */
                                                context_iso_urb->
-                                                   buffer[tx_offset] = 1;
+                                                       buffer[tx_offset] = 1;
                                                /* add 2 byte flags and 16bit CRC at end of ISDN frame */
                                                fifo->bit_line += 32;
                                        }
@@ -632,12 +632,12 @@ tx_iso_complete(struct urb *urb)
                                /* define packet delimeters within the URB buffer */
                                urb->iso_frame_desc[k].offset = tx_offset;
                                urb->iso_frame_desc[k].length =
-                                   current_len + 1;
+                                       current_len + 1;
 
                                tx_offset += (current_len + 1);
                        } else {
                                urb->iso_frame_desc[k].offset =
-                                   tx_offset++;
+                                       tx_offset++;
 
                                urb->iso_frame_desc[k].length = 1;
                                fifo->bit_line -= sink; /* we lower data margin every msec */
@@ -683,7 +683,7 @@ rx_iso_complete(struct urb *urb)
        usb_fifo *fifo = context_iso_urb->owner_fifo;
        hfcusb_data *hfc = fifo->hfc;
        int k, len, errcode, offset, num_isoc_packets, fifon, maxlen,
-           status;
+               status;
        unsigned int iso_status;
        __u8 *buf;
        static __u8 eof[8];
@@ -723,10 +723,10 @@ rx_iso_complete(struct urb *urb)
 
                        if (fifon == HFCUSB_D_RX) {
                                DBG(HFCUSB_DBG_VERBOSE_USB,
-                                      "HFC-S USB: ISO-D-RX lst_urblen:%2d "
-                                      "act_urblen:%2d max-urblen:%2d EOF:0x%0x",
-                                      fifo->last_urblen, len, maxlen,
-                                      eof[5]);
+                                   "HFC-S USB: ISO-D-RX lst_urblen:%2d "
+                                   "act_urblen:%2d max-urblen:%2d EOF:0x%0x",
+                                   fifo->last_urblen, len, maxlen,
+                                   eof[5]);
 
                                DBG_PACKET(HFCUSB_DBG_VERBOSE_USB, buf, len);
                        }
@@ -778,7 +778,7 @@ rx_iso_complete(struct urb *urb)
 
 /* collect rx data from INT- and ISO-URBs  */
 static void
-collect_rx_frame(usb_fifo * fifo, __u8 * data, int len, int finish)
+collect_rx_frame(usb_fifo *fifo, __u8 *data, int len, int finish)
 {
        hfcusb_data *hfc = fifo->hfc;
        int transp_mode, fifon;
@@ -802,8 +802,8 @@ collect_rx_frame(usb_fifo * fifo, __u8 * data, int len, int finish)
                        memcpy(skb_put(fifo->skbuff, len), data, len);
                } else {
                        DBG(HFCUSB_DBG_FIFO_ERR,
-                              "HCF-USB: got frame exceeded fifo->max_size(%d) fifo(%d)",
-                              fifo->max_size, fifon);
+                           "HCF-USB: got frame exceeded fifo->max_size(%d) fifo(%d)",
+                           fifo->max_size, fifon);
                        DBG_SKB(HFCUSB_DBG_VERBOSE_USB, fifo->skbuff);
                        skb_trim(fifo->skbuff, 0);
                }
@@ -817,7 +817,7 @@ collect_rx_frame(usb_fifo * fifo, __u8 * data, int len, int finish)
        /* we have a complete hdlc packet */
        if (finish) {
                if (fifo->skbuff->len > 3 &&
-                               !fifo->skbuff->data[fifo->skbuff->len - 1]) {
+                   !fifo->skbuff->data[fifo->skbuff->len - 1]) {
 
                        if (fifon == HFCUSB_D_RX) {
                                DBG(HFCUSB_DBG_DCHANNEL,
@@ -876,10 +876,10 @@ rx_int_complete(struct urb *urb)
 
        if (fifon == HFCUSB_D_RX) {
                DBG(HFCUSB_DBG_VERBOSE_USB,
-                      "HFC-S USB: INT-D-RX lst_urblen:%2d "
-                      "act_urblen:%2d max-urblen:%2d EOF:0x%0x",
-                      fifo->last_urblen, len, maxlen,
-                      eof[5]);
+                   "HFC-S USB: INT-D-RX lst_urblen:%2d "
+                   "act_urblen:%2d max-urblen:%2d EOF:0x%0x",
+                   fifo->last_urblen, len, maxlen,
+                   eof[5]);
                DBG_PACKET(HFCUSB_DBG_VERBOSE_USB, buf, len);
        }
 
@@ -909,7 +909,7 @@ rx_int_complete(struct urb *urb)
 
 /* start initial INT-URB for certain fifo */
 static void
-start_int_fifo(usb_fifo * fifo)
+start_int_fifo(usb_fifo *fifo)
 {
        int errcode;
 
@@ -936,7 +936,7 @@ start_int_fifo(usb_fifo * fifo)
 }
 
 static void
-setup_bchannel(hfcusb_data * hfc, int channel, int mode)
+setup_bchannel(hfcusb_data *hfc, int channel, int mode)
 {
        __u8 val, idx_table[2] = { 0, 2 };
 
@@ -999,100 +999,100 @@ hfc_usb_l2l1(struct hisax_if *my_hisax_if, int pr, void *arg)
        hfcusb_data *hfc = fifo->hfc;
 
        switch (pr) {
-               case PH_ACTIVATE | REQUEST:
-                       if (fifo->fifonum == HFCUSB_D_TX) {
+       case PH_ACTIVATE | REQUEST:
+               if (fifo->fifonum == HFCUSB_D_TX) {
+                       DBG(HFCUSB_DBG_STATES,
+                           "HFC_USB: hfc_usb_d_l2l1 D-chan: PH_ACTIVATE | REQUEST");
+
+                       if (hfc->l1_state != 3
+                           && hfc->l1_state != 7) {
+                               hfc->d_if.ifc.l1l2(&hfc->d_if.ifc,
+                                                  PH_DEACTIVATE |
+                                                  INDICATION,
+                                                  NULL);
                                DBG(HFCUSB_DBG_STATES,
-                                   "HFC_USB: hfc_usb_d_l2l1 D-chan: PH_ACTIVATE | REQUEST");
-
-                               if (hfc->l1_state != 3
-                                   && hfc->l1_state != 7) {
-                                       hfc->d_if.ifc.l1l2(&hfc->d_if.ifc,
-                                                          PH_DEACTIVATE |
+                                   "HFC-S USB: PH_DEACTIVATE | INDICATION sent (not state 3 or 7)");
+                       } else {
+                               if (hfc->l1_state == 7) {       /* l1 already active */
+                                       hfc->d_if.ifc.l1l2(&hfc->
+                                                          d_if.
+                                                          ifc,
+                                                          PH_ACTIVATE
+                                                          |
                                                           INDICATION,
                                                           NULL);
                                        DBG(HFCUSB_DBG_STATES,
-                                           "HFC-S USB: PH_DEACTIVATE | INDICATION sent (not state 3 or 7)");
+                                           "HFC-S USB: PH_ACTIVATE | INDICATION sent again ;)");
                                } else {
-                                       if (hfc->l1_state == 7) {       /* l1 already active */
-                                               hfc->d_if.ifc.l1l2(&hfc->
-                                                                  d_if.
-                                                                  ifc,
-                                                                  PH_ACTIVATE
-                                                                  |
-                                                                  INDICATION,
-                                                                  NULL);
-                                               DBG(HFCUSB_DBG_STATES,
-                                                   "HFC-S USB: PH_ACTIVATE | INDICATION sent again ;)");
-                                       } else {
-                                               /* force sending sending INFO1 */
-                                               queue_control_request(hfc,
-                                                                     HFCUSB_STATES,
-                                                                     0x14,
-                                                                     1);
-                                               mdelay(1);
-                                               /* start l1 activation */
-                                               queue_control_request(hfc,
-                                                                     HFCUSB_STATES,
-                                                                     0x04,
-                                                                     1);
-                                               if (!timer_pending
-                                                   (&hfc->t3_timer)) {
-                                                       hfc->t3_timer.
-                                                           expires =
-                                                           jiffies +
-                                                           (HFC_TIMER_T3 *
-                                                            HZ) / 1000;
-                                                       add_timer(&hfc->
-                                                                 t3_timer);
-                                               }
+                                       /* force sending sending INFO1 */
+                                       queue_control_request(hfc,
+                                                             HFCUSB_STATES,
+                                                             0x14,
+                                                             1);
+                                       mdelay(1);
+                                       /* start l1 activation */
+                                       queue_control_request(hfc,
+                                                             HFCUSB_STATES,
+                                                             0x04,
+                                                             1);
+                                       if (!timer_pending
+                                           (&hfc->t3_timer)) {
+                                               hfc->t3_timer.
+                                                       expires =
+                                                       jiffies +
+                                                       (HFC_TIMER_T3 *
+                                                        HZ) / 1000;
+                                               add_timer(&hfc->
+                                                         t3_timer);
                                        }
                                }
-                       } else {
-                               DBG(HFCUSB_DBG_STATES,
-                                   "HFC_USB: hfc_usb_d_l2l1 B-chan: PH_ACTIVATE | REQUEST");
-                               setup_bchannel(hfc,
-                                           (fifo->fifonum ==
-                                            HFCUSB_B1_TX) ? 0 : 1,
-                                           (long) arg);
-                               fifo->hif->l1l2(fifo->hif,
-                                               PH_ACTIVATE | INDICATION,
-                                               NULL);
-                       }
-                       break;
-               case PH_DEACTIVATE | REQUEST:
-                       if (fifo->fifonum == HFCUSB_D_TX) {
-                               DBG(HFCUSB_DBG_STATES,
-                                   "HFC_USB: hfc_usb_d_l2l1 D-chan: PH_DEACTIVATE | REQUEST");
-                       } else {
-                               DBG(HFCUSB_DBG_STATES,
-                                   "HFC_USB: hfc_usb_d_l2l1 Bx-chan: PH_DEACTIVATE | REQUEST");
-                               setup_bchannel(hfc,
-                                           (fifo->fifonum ==
-                                            HFCUSB_B1_TX) ? 0 : 1,
-                                           (int) L1_MODE_NULL);
-                               fifo->hif->l1l2(fifo->hif,
-                                               PH_DEACTIVATE | INDICATION,
-                                               NULL);
-                       }
-                       break;
-               case PH_DATA | REQUEST:
-                       if (fifo->skbuff && fifo->delete_flg) {
-                               dev_kfree_skb_any(fifo->skbuff);
-                               fifo->skbuff = NULL;
-                               fifo->delete_flg = 0;
                        }
-                       fifo->skbuff = arg;     /* we have a new buffer */
-                       break;
-               default:
+               } else {
+                       DBG(HFCUSB_DBG_STATES,
+                           "HFC_USB: hfc_usb_d_l2l1 B-chan: PH_ACTIVATE | REQUEST");
+                       setup_bchannel(hfc,
+                                      (fifo->fifonum ==
+                                       HFCUSB_B1_TX) ? 0 : 1,
+                                      (long) arg);
+                       fifo->hif->l1l2(fifo->hif,
+                                       PH_ACTIVATE | INDICATION,
+                                       NULL);
+               }
+               break;
+       case PH_DEACTIVATE | REQUEST:
+               if (fifo->fifonum == HFCUSB_D_TX) {
+                       DBG(HFCUSB_DBG_STATES,
+                           "HFC_USB: hfc_usb_d_l2l1 D-chan: PH_DEACTIVATE | REQUEST");
+               } else {
                        DBG(HFCUSB_DBG_STATES,
-                              "HFC_USB: hfc_usb_d_l2l1: unknown state : %#x", pr);
-                       break;
+                           "HFC_USB: hfc_usb_d_l2l1 Bx-chan: PH_DEACTIVATE | REQUEST");
+                       setup_bchannel(hfc,
+                                      (fifo->fifonum ==
+                                       HFCUSB_B1_TX) ? 0 : 1,
+                                      (int) L1_MODE_NULL);
+                       fifo->hif->l1l2(fifo->hif,
+                                       PH_DEACTIVATE | INDICATION,
+                                       NULL);
+               }
+               break;
+       case PH_DATA | REQUEST:
+               if (fifo->skbuff && fifo->delete_flg) {
+                       dev_kfree_skb_any(fifo->skbuff);
+                       fifo->skbuff = NULL;
+                       fifo->delete_flg = 0;
+               }
+               fifo->skbuff = arg;     /* we have a new buffer */
+               break;
+       default:
+               DBG(HFCUSB_DBG_STATES,
+                   "HFC_USB: hfc_usb_d_l2l1: unknown state : %#x", pr);
+               break;
        }
 }
 
 /* initial init HFC-S USB chip registers, HiSax interface, USB URBs */
 static int
-hfc_usb_init(hfcusb_data * hfc)
+hfc_usb_init(hfcusb_data *hfc)
 {
        usb_fifo *fifo;
        int i;
@@ -1138,7 +1138,7 @@ hfc_usb_init(hfcusb_data * hfc)
                write_usb(hfc, HFCUSB_FIFO, i); /* select the desired fifo */
                fifo[i].skbuff = NULL;  /* init buffer pointer */
                fifo[i].max_size =
-                   (i <= HFCUSB_B2_RX) ? MAX_BCH_SIZE : MAX_DFRAME_LEN;
+                       (i <= HFCUSB_B2_RX) ? MAX_BCH_SIZE : MAX_DFRAME_LEN;
                fifo[i].last_urblen = 0;
                /* set 2 bit for D- & E-channel */
                write_usb(hfc, HFCUSB_HDLC_PAR,
@@ -1185,7 +1185,7 @@ hfc_usb_init(hfcusb_data * hfc)
        usb_fill_control_urb(hfc->ctrl_urb,
                             hfc->dev,
                             hfc->ctrl_out_pipe,
-                            (u_char *) & hfc->ctrl_write,
+                            (u_char *)&hfc->ctrl_write,
                             NULL, 0, ctrl_complete, hfc);
        /* Init All Fifos */
        for (i = 0; i < HFCUSB_NUM_FIFOS; i++) {
@@ -1264,9 +1264,9 @@ hfc_usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
        struct usb_host_endpoint *ep;
        int ifnum = iface->desc.bInterfaceNumber;
        int i, idx, alt_idx, probe_alt_setting, vend_idx, cfg_used, *vcf,
-           attr, cfg_found, cidx, ep_addr;
+               attr, cfg_found, cidx, ep_addr;
        int cmptbl[16], small_match, iso_packet_size, packet_size,
-           alt_used = 0;
+               alt_used = 0;
        hfcsusb_vdata *driver_info;
 
        vend_idx = 0xffff;
@@ -1309,7 +1309,7 @@ hfc_usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
                                for (i = 0; i < iface->desc.bNumEndpoints;
                                     i++) {
                                        ep_addr =
-                                           ep->desc.bEndpointAddress;
+                                               ep->desc.bEndpointAddress;
                                        /* get endpoint base */
                                        idx = ((ep_addr & 0x7f) - 1) * 2;
                                        if (ep_addr & 0x80)
@@ -1345,7 +1345,7 @@ hfc_usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
                                        if (cfg_used < small_match) {
                                                small_match = cfg_used;
                                                alt_used =
-                                                   probe_alt_setting;
+                                                       probe_alt_setting;
                                                iface_used = iface;
                                        }
                                }
@@ -1376,95 +1376,95 @@ hfc_usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
                                if (vcf[idx] != EP_NOP
                                    && vcf[idx] != EP_NUL) {
                                        switch (attr) {
-                                               case USB_ENDPOINT_XFER_INT:
-                                                       context->
-                                                           fifos[cidx].
-                                                           pipe =
-                                                           usb_rcvintpipe
-                                                           (dev,
-                                                            ep->desc.
-                                                            bEndpointAddress);
+                                       case USB_ENDPOINT_XFER_INT:
+                                               context->
+                                                       fifos[cidx].
+                                                       pipe =
+                                                       usb_rcvintpipe
+                                                       (dev,
+                                                        ep->desc.
+                                                        bEndpointAddress);
+                                               context->
+                                                       fifos[cidx].
+                                                       usb_transfer_mode
+                                                       = USB_INT;
+                                               packet_size =
+                                                       le16_to_cpu(ep->desc.wMaxPacketSize);
+                                               break;
+                                       case USB_ENDPOINT_XFER_BULK:
+                                               if (ep_addr & 0x80)
                                                        context->
-                                                           fifos[cidx].
-                                                           usb_transfer_mode
-                                                           = USB_INT;
-                                                       packet_size =
-                                                           le16_to_cpu(ep->desc.wMaxPacketSize);
-                                                       break;
-                                               case USB_ENDPOINT_XFER_BULK:
-                                                       if (ep_addr & 0x80)
-                                                               context->
-                                                                   fifos
-                                                                   [cidx].
-                                                                   pipe =
-                                                                   usb_rcvbulkpipe
-                                                                   (dev,
-                                                                    ep->
-                                                                    desc.
-                                                                    bEndpointAddress);
-                                                       else
-                                                               context->
-                                                                   fifos
-                                                                   [cidx].
-                                                                   pipe =
-                                                                   usb_sndbulkpipe
-                                                                   (dev,
-                                                                    ep->
-                                                                    desc.
-                                                                    bEndpointAddress);
+                                                               fifos
+                                                               [cidx].
+                                                               pipe =
+                                                               usb_rcvbulkpipe
+                                                               (dev,
+                                                                ep->
+                                                                desc.
+                                                                bEndpointAddress);
+                                               else
                                                        context->
-                                                           fifos[cidx].
-                                                           usb_transfer_mode
-                                                           = USB_BULK;
-                                                       packet_size =
-                                                           le16_to_cpu(ep->desc.wMaxPacketSize);
-                                                       break;
-                                               case USB_ENDPOINT_XFER_ISOC:
-                                                       if (ep_addr & 0x80)
-                                                               context->
-                                                                   fifos
-                                                                   [cidx].
-                                                                   pipe =
-                                                                   usb_rcvisocpipe
-                                                                   (dev,
-                                                                    ep->
-                                                                    desc.
-                                                                    bEndpointAddress);
-                                                       else
-                                                               context->
-                                                                   fifos
-                                                                   [cidx].
-                                                                   pipe =
-                                                                   usb_sndisocpipe
-                                                                   (dev,
-                                                                    ep->
-                                                                    desc.
-                                                                    bEndpointAddress);
+                                                               fifos
+                                                               [cidx].
+                                                               pipe =
+                                                               usb_sndbulkpipe
+                                                               (dev,
+                                                                ep->
+                                                                desc.
+                                                                bEndpointAddress);
+                                               context->
+                                                       fifos[cidx].
+                                                       usb_transfer_mode
+                                                       = USB_BULK;
+                                               packet_size =
+                                                       le16_to_cpu(ep->desc.wMaxPacketSize);
+                                               break;
+                                       case USB_ENDPOINT_XFER_ISOC:
+                                               if (ep_addr & 0x80)
                                                        context->
-                                                           fifos[cidx].
-                                                           usb_transfer_mode
-                                                           = USB_ISOC;
-                                                       iso_packet_size =
-                                                           le16_to_cpu(ep->desc.wMaxPacketSize);
-                                                       break;
-                                               default:
+                                                               fifos
+                                                               [cidx].
+                                                               pipe =
+                                                               usb_rcvisocpipe
+                                                               (dev,
+                                                                ep->
+                                                                desc.
+                                                                bEndpointAddress);
+                                               else
                                                        context->
-                                                           fifos[cidx].
-                                                           pipe = 0;
+                                                               fifos
+                                                               [cidx].
+                                                               pipe =
+                                                               usb_sndisocpipe
+                                                               (dev,
+                                                                ep->
+                                                                desc.
+                                                                bEndpointAddress);
+                                               context->
+                                                       fifos[cidx].
+                                                       usb_transfer_mode
+                                                       = USB_ISOC;
+                                               iso_packet_size =
+                                                       le16_to_cpu(ep->desc.wMaxPacketSize);
+                                               break;
+                                       default:
+                                               context->
+                                                       fifos[cidx].
+                                                       pipe = 0;
                                        }       /* switch attribute */
 
                                        if (context->fifos[cidx].pipe) {
                                                context->fifos[cidx].
-                                                   fifonum = cidx;
+                                                       fifonum = cidx;
                                                context->fifos[cidx].hfc =
-                                                   context;
+                                                       context;
                                                context->fifos[cidx].usb_packet_maxlen =
-                                                   le16_to_cpu(ep->desc.wMaxPacketSize);
+                                                       le16_to_cpu(ep->desc.wMaxPacketSize);
                                                context->fifos[cidx].
-                                                   intervall =
-                                                   ep->desc.bInterval;
+                                                       intervall =
+                                                       ep->desc.bInterval;
                                                context->fifos[cidx].
-                                                   skbuff = NULL;
+                                                       skbuff = NULL;
                                        }
                                }
                                ep++;
@@ -1480,14 +1480,14 @@ hfc_usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
 
                        /* create the control pipes needed for register access */
                        context->ctrl_in_pipe =
-                           usb_rcvctrlpipe(context->dev, 0);
+                               usb_rcvctrlpipe(context->dev, 0);
                        context->ctrl_out_pipe =
-                           usb_sndctrlpipe(context->dev, 0);
+                               usb_sndctrlpipe(context->dev, 0);
                        context->ctrl_urb = usb_alloc_urb(0, GFP_KERNEL);
 
                        driver_info =
-                           (hfcsusb_vdata *) hfcusb_idtab[vend_idx].
-                           driver_info;
+                               (hfcsusb_vdata *) hfcusb_idtab[vend_idx].
+                               driver_info;
                        printk(KERN_INFO "HFC-S USB: detected \"%s\"\n",
                               driver_info->vend_name);