V4L/DVB (10955): cx231xx: CodingStyle automatic fixes with Lindent

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 260 insertions, 262 deletions

diff --git a/drivers/media/video/cx231xx/cx231xx.h b/drivers/media/video/cx231xx/cx231xx.h
index 5fef87fbbcec..1f6c5be65a55 100644
--- a/drivers/media/video/cx231xx/cx231xx.h
+++ b/drivers/media/video/cx231xx/cx231xx.h
@@ -2,7 +2,7 @@
    cx231xx.h - driver for Conexant Cx23100/101/102 USB video capture devices
 
    Copyright (C) 2008 <srinivasa.deevi at conexant dot com>
-        Based on em28xx driver
+        Based on em28xx driver
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -65,7 +65,7 @@
 
 /* Params for validated field */
 #define CX231XX_BOARD_NOT_VALIDATED     1
-#define CX231XX_BOARD_VALIDATED         0
+#define CX231XX_BOARD_VALIDATED         0
 
 /* maximum number of cx231xx boards */
 #define CX231XX_MAXBOARDS               8
@@ -82,17 +82,14 @@
  */
 #define CX231XX_NUM_PACKETS             40
 
-
 /* default alternate; 0 means choose the best */
 #define CX231XX_PINOUT                  0
 
 #define CX231XX_INTERLACED_DEFAULT      1
 
-
 /* time to wait when stopping the isoc transfer */
 #define CX231XX_URB_TIMEOUT             msecs_to_jiffies(CX231XX_NUM_BUFS * CX231XX_NUM_PACKETS)
 
-
 enum cx231xx_mode {
         CX231XX_SUSPEND,
         CX231XX_ANALOG_MODE,
@@ -113,47 +110,45 @@ enum cx231xx_stream_state {
 struct cx231xx;
 
 struct cx231xx_usb_isoc_ctl {
-                /* max packet size of isoc transaction */
-        int                             max_pkt_size;
+        /* max packet size of isoc transaction */
+        int max_pkt_size;
 
-                /* number of allocated urbs */
-        int                             num_bufs;
+        /* number of allocated urbs */
+        int num_bufs;
 
-                /* urb for isoc transfers */
-        struct urb                      **urb;
+        /* urb for isoc transfers */
+        struct urb **urb;
 
-                /* transfer buffers for isoc transfer */
-        char                            **transfer_buffer;
+        /* transfer buffers for isoc transfer */
+        char **transfer_buffer;
 
-                /* Last buffer command and region */
-        u8                              cmd;
-        int                             pos, size, pktsize;
+        /* Last buffer command and region */
+        u8 cmd;
+        int pos, size, pktsize;
 
-                /* Last field: ODD or EVEN? */
-        int                             field;
+        /* Last field: ODD or EVEN? */
+        int field;
 
-                /* Stores incomplete commands */
-        u32                             tmp_buf;
-        int                             tmp_buf_len;
+        /* Stores incomplete commands */
+        u32 tmp_buf;
+        int tmp_buf_len;
 
-                /* Stores already requested buffers */
-        struct cx231xx_buffer           *buf;
+        /* Stores already requested buffers */
+        struct cx231xx_buffer *buf;
 
-                /* Stores the number of received fields */
-        int                             nfields;
+        /* Stores the number of received fields */
+        int nfields;
 
-                /* isoc urb callback */
-        int (*isoc_copy) (struct cx231xx *dev, struct urb *urb);
+        /* isoc urb callback */
+        int (*isoc_copy) (struct cx231xx * dev, struct urb * urb);
 
 };
 
-
-
 struct cx231xx_fmt {
-        char  *name;
-        u32   fourcc;          /* v4l2 format id */
-    int   depth;
-    int   reg;
+        char *name;
+        u32 fourcc;             /* v4l2 format id */
+        int depth;
+        int reg;
 };
 
 /* buffer for one video frame */
@@ -167,24 +162,23 @@ struct cx231xx_buffer {
 };
 
 struct cx231xx_dmaqueue {
-        struct list_head   active;
-        struct list_head   queued;
+        struct list_head active;
+        struct list_head queued;
 
-        wait_queue_head_t  wq;
+        wait_queue_head_t wq;
 
         /* Counters to control buffer fill */
-        int                pos;
-    u8                 is_partial_line;
-    u8                 partial_buf[8];
-    u8                 last_sav;
-    int                current_field;
-    u32                bytes_left_in_line;
-    u32                lines_completed;
-    u8                 field1_done;
-    u32                lines_per_field;
+        int pos;
+        u8 is_partial_line;
+        u8 partial_buf[8];
+        u8 last_sav;
+        int current_field;
+        u32 bytes_left_in_line;
+        u32 lines_completed;
+        u8 field1_done;
+        u32 lines_per_field;
 };
 
-
 /* inputs */
 
 #define MAX_CX231XX_INPUT               4
@@ -193,35 +187,35 @@ enum cx231xx_itype {
         CX231XX_VMUX_COMPOSITE1 = 1,
         CX231XX_VMUX_SVIDEO,
         CX231XX_VMUX_TELEVISION,
-    CX231XX_VMUX_CABLE,
-    CX231XX_RADIO,
-    CX231XX_VMUX_DVB,
+        CX231XX_VMUX_CABLE,
+        CX231XX_RADIO,
+        CX231XX_VMUX_DVB,
         CX231XX_VMUX_DEBUG
 };
 
 enum cx231xx_v_input {
-    CX231XX_VIN_1_1 = 0x1,
-    CX231XX_VIN_2_1,
-    CX231XX_VIN_3_1,
-    CX231XX_VIN_4_1,
-    CX231XX_VIN_1_2 = 0x01,
-    CX231XX_VIN_2_2,
-    CX231XX_VIN_3_2,
-    CX231XX_VIN_1_3 = 0x1,
-    CX231XX_VIN_2_3,
-    CX231XX_VIN_3_3,
+        CX231XX_VIN_1_1 = 0x1,
+        CX231XX_VIN_2_1,
+        CX231XX_VIN_3_1,
+        CX231XX_VIN_4_1,
+        CX231XX_VIN_1_2 = 0x01,
+        CX231XX_VIN_2_2,
+        CX231XX_VIN_3_2,
+        CX231XX_VIN_1_3 = 0x1,
+        CX231XX_VIN_2_3,
+        CX231XX_VIN_3_3,
 };
 
 /* cx231xx has two audio inputs: tuner and line in */
 enum cx231xx_amux {
         /* This is the only entry for cx231xx tuner input */
-        CX231XX_AMUX_VIDEO,         /* cx231xx tuner*/
+        CX231XX_AMUX_VIDEO,     /* cx231xx tuner */
         CX231XX_AMUX_LINE_IN,   /* Line In */
 };
 
 struct cx231xx_reg_seq {
         unsigned char bit;
-    unsigned char val;
+        unsigned char val;
         int sleep;
 };
 
@@ -239,41 +233,40 @@ enum cx231xx_decoder {
         CX231XX_AVDECODER
 };
 
-typedef enum _I2C_MASTER_PORT
-{
-     I2C_0 =0,
-     I2C_1 =1,
-     I2C_2 =2,
-     I2C_3 =3
-}CX231XX_I2C_MASTER_PORT;
+typedef enum _I2C_MASTER_PORT {
+        I2C_0 = 0,
+        I2C_1 = 1,
+        I2C_2 = 2,
+        I2C_3 = 3
+} CX231XX_I2C_MASTER_PORT;
 
 struct cx231xx_board {
         char *name;
         int vchannels;
         int tuner_type;
         int tuner_addr;
-    v4l2_std_id norm;               /* tv norm */
+        v4l2_std_id norm;       /* tv norm */
 
-    /* demod related */
-    int demod_addr;
-    u8 demod_xfer_mode;  /* 0 - Serial; 1 - parallel */
+        /* demod related */
+        int demod_addr;
+        u8 demod_xfer_mode;     /* 0 - Serial; 1 - parallel */
 
         /* GPIO Pins */
         struct cx231xx_reg_seq *dvb_gpio;
         struct cx231xx_reg_seq *suspend_gpio;
         struct cx231xx_reg_seq *tuner_gpio;
-    u8 tuner_sif_gpio;
-    u8 tuner_scl_gpio;
-    u8 tuner_sda_gpio;
+        u8 tuner_sif_gpio;
+        u8 tuner_scl_gpio;
+        u8 tuner_sda_gpio;
 
-    /* PIN ctrl */
-    u32 ctl_pin_status_mask;
-    u8  agc_analog_digital_select_gpio;
-    u32 gpio_pin_status_mask;
+        /* PIN ctrl */
+        u32 ctl_pin_status_mask;
+        u8 agc_analog_digital_select_gpio;
+        u32 gpio_pin_status_mask;
 
-    /* i2c masters */
-    u8 tuner_i2c_master;
-    u8 demod_i2c_master;
+        /* i2c masters */
+        u8 tuner_i2c_master;
+        u8 demod_i2c_master;
 
         unsigned int max_range_640_480:1;
         unsigned int has_dvb:1;
@@ -283,9 +276,9 @@ struct cx231xx_board {
 
         enum cx231xx_decoder decoder;
 
-        struct cx231xx_input       input[MAX_CX231XX_INPUT];
-        struct cx231xx_input      radio;
-        IR_KEYTAB_TYPE            *ir_codes;
+        struct cx231xx_input input[MAX_CX231XX_INPUT];
+        struct cx231xx_input radio;
+        IR_KEYTAB_TYPE *ir_codes;
 };
 
 /* device states */
@@ -295,22 +288,20 @@ enum cx231xx_dev_state {
         DEV_MISCONFIGURED = 0x04,
 };
 
-enum AFE_MODE
-{
-    AFE_MODE_LOW_IF,
-    AFE_MODE_BASEBAND,
-    AFE_MODE_EU_HI_IF,
-    AFE_MODE_US_HI_IF,
-    AFE_MODE_JAPAN_HI_IF
+enum AFE_MODE {
+        AFE_MODE_LOW_IF,
+        AFE_MODE_BASEBAND,
+        AFE_MODE_EU_HI_IF,
+        AFE_MODE_US_HI_IF,
+        AFE_MODE_JAPAN_HI_IF
 };
 
-enum AUDIO_INPUT
-{
-    AUDIO_INPUT_MUTE,
-    AUDIO_INPUT_LINE,
-    AUDIO_INPUT_TUNER_TV,
-    AUDIO_INPUT_SPDIF,
-    AUDIO_INPUT_TUNER_FM
+enum AUDIO_INPUT {
+        AUDIO_INPUT_MUTE,
+        AUDIO_INPUT_LINE,
+        AUDIO_INPUT_TUNER_TV,
+        AUDIO_INPUT_SPDIF,
+        AUDIO_INPUT_TUNER_FM
 };
 
 #define CX231XX_AUDIO_BUFS              5
@@ -319,7 +310,6 @@ enum AUDIO_INPUT
 #define CX231XX_STOP_AUDIO              0
 #define CX231XX_START_AUDIO             1
 
-
 /* cx231xx extensions */
 #define CX231XX_AUDIO                   0x10
 #define CX231XX_DVB                     0x20
@@ -330,169 +320,167 @@ struct cx231xx_audio {
         struct urb *urb[CX231XX_AUDIO_BUFS];
         struct usb_device *udev;
         unsigned int capture_transfer_done;
-        struct snd_pcm_substream   *capture_pcm_substream;
+        struct snd_pcm_substream *capture_pcm_substream;
 
         unsigned int hwptr_done_capture;
-        struct snd_card            *sndcard;
+        struct snd_card *sndcard;
 
         int users, shutdown;
         enum cx231xx_stream_state capture_stream;
         spinlock_t slock;
 
-    int alt;                            /* alternate */
-        int max_pkt_size;                   /* max packet size of isoc transaction */
-        int num_alt;                        /* Number of alternative settings */
+        int alt;                /* alternate */
+        int max_pkt_size;       /* max packet size of isoc transaction */
+        int num_alt;            /* Number of alternative settings */
         unsigned int *alt_max_pkt_size; /* array of wMaxPacketSize */
-    u16 end_point_addr;
+        u16 end_point_addr;
 };
 
 struct cx231xx;
 
 struct cx231xx_fh {
         struct cx231xx *dev;
-        unsigned int  stream_on:1;          /* Locks streams */
-        int           radio;
+        unsigned int stream_on:1;       /* Locks streams */
+        int radio;
 
-        struct videobuf_queue        vb_vidq;
+        struct videobuf_queue vb_vidq;
 
-        enum v4l2_buf_type           type;
+        enum v4l2_buf_type type;
 };
 
 /**********************************************************************************/
 /* set/get i2c */
-#define I2C_SPEED_1M            0x0  /* 00--1Mb/s, 01-400kb/s, 10--100kb/s, 11--5Mb/s */
-#define I2C_SPEED_400K          0x1  /* 00--1Mb/s, 01-400kb/s, 10--100kb/s, 11--5Mb/s */
-#define I2C_SPEED_100K          0x2  /* 00--1Mb/s, 01-400kb/s, 10--100kb/s, 11--5Mb/s */
-#define I2C_SPEED_5M            0x3      /* 00--1Mb/s, 01-400kb/s, 10--100kb/s, 11--5Mb/s */
+#define I2C_SPEED_1M            0x0     /* 00--1Mb/s, 01-400kb/s, 10--100kb/s, 11--5Mb/s */
+#define I2C_SPEED_400K          0x1     /* 00--1Mb/s, 01-400kb/s, 10--100kb/s, 11--5Mb/s */
+#define I2C_SPEED_100K          0x2     /* 00--1Mb/s, 01-400kb/s, 10--100kb/s, 11--5Mb/s */
+#define I2C_SPEED_5M            0x3     /* 00--1Mb/s, 01-400kb/s, 10--100kb/s, 11--5Mb/s */
 
-#define I2C_STOP                0x0  /* 0-- STOP transaction */
-#define I2C_NOSTOP              0x1  /* 1-- do not transmit STOP at end of transaction */
-#define I2C_SYNC                0x1  /* 1--alllow slave to insert clock wait states */
+#define I2C_STOP                0x0     /* 0-- STOP transaction */
+#define I2C_NOSTOP              0x1     /* 1-- do not transmit STOP at end of transaction */
+#define I2C_SYNC                0x1     /* 1--alllow slave to insert clock wait states */
 
 struct cx231xx_i2c {
-        struct cx231xx             *dev;
+        struct cx231xx *dev;
 
-        int                        nr;
+        int nr;
 
         /* i2c i/o */
-        struct i2c_adapter         i2c_adap;
-        struct i2c_algo_bit_data   i2c_algo;
-        struct i2c_client          i2c_client;
-        u32                        i2c_rc;
+        struct i2c_adapter i2c_adap;
+        struct i2c_algo_bit_data i2c_algo;
+        struct i2c_client i2c_client;
+        u32 i2c_rc;
 
         /* different settings for each bus */
-        u8                         i2c_period;
-    u8                         i2c_nostop;
-    u8                         i2c_reserve;
+        u8 i2c_period;
+        u8 i2c_nostop;
+        u8 i2c_reserve;
 };
 
-struct cx231xx_i2c_xfer_data{
-    u8                  dev_addr;
-    u8                  direction; /* 1 - IN, 0 - OUT */
-    u8                  saddr_len; /* sub address len */
-    u16                 saddr_dat; /* sub addr data */
-    u8                  buf_size;  /* buffer size */
-    u8*                 p_buffer;  /* pointer to the buffer */
+struct cx231xx_i2c_xfer_data {
+        u8 dev_addr;
+        u8 direction;           /* 1 - IN, 0 - OUT */
+        u8 saddr_len;           /* sub address len */
+        u16 saddr_dat;          /* sub addr data */
+        u8 buf_size;            /* buffer size */
+        u8 *p_buffer;           /* pointer to the buffer */
 };
 
-typedef struct _VENDOR_REQUEST_IN
-{
-        u8                                      bRequest;
-        u16                                     wValue;
-        u16                                     wIndex;
-        u16                                     wLength;
-        u8                                      direction;
-        u8                                      bData;
-        u8                                      *pBuff;
+typedef struct _VENDOR_REQUEST_IN {
+        u8 bRequest;
+        u16 wValue;
+        u16 wIndex;
+        u16 wLength;
+        u8 direction;
+        u8 bData;
+        u8 *pBuff;
 } VENDOR_REQUEST_IN, *PVENDOR_REQUEST_IN;
 
 struct cx231xx_ctrl {
         struct v4l2_queryctrl v;
-        u32                   off;
-        u32                   reg;
-        u32                   mask;
-        u32                   shift;
+        u32 off;
+        u32 reg;
+        u32 mask;
+        u32 shift;
 };
 
-typedef enum{
-    Raw_Video = 0,
-    Audio,
-    Vbi,        /* VANC */
-    Sliced_cc,  /* HANC */
-    TS1_serial_mode,
-    TS2,
-    TS1_parallel_mode
-}TRANSFER_TYPE;
+typedef enum {
+        Raw_Video = 0,
+        Audio,
+        Vbi,                    /* VANC */
+        Sliced_cc,              /* HANC */
+        TS1_serial_mode,
+        TS2,
+        TS1_parallel_mode
+} TRANSFER_TYPE;
 
 struct cx231xx_video_mode {
-    /* Isoc control struct */
+        /* Isoc control struct */
         struct cx231xx_dmaqueue vidq;
         struct cx231xx_usb_isoc_ctl isoc_ctl;
         spinlock_t slock;
 
         /* usb transfer */
-        int alt;                                /* alternate */
-        int max_pkt_size;                   /* max packet size of isoc transaction */
-        int num_alt;                        /* Number of alternative settings */
+        int alt;                /* alternate */
+        int max_pkt_size;       /* max packet size of isoc transaction */
+        int num_alt;            /* Number of alternative settings */
         unsigned int *alt_max_pkt_size; /* array of wMaxPacketSize */
-    u16 end_point_addr;
+        u16 end_point_addr;
 };
 
-
 /* main device struct */
 struct cx231xx {
         /* generic device properties */
-        char name[30];                      /* name (including minor) of the device */
-        int model;                              /* index in the device_data struct */
-        int devno;                              /* marks the number of this device */
+        char name[30];          /* name (including minor) of the device */
+        int model;              /* index in the device_data struct */
+        int devno;              /* marks the number of this device */
 
         struct cx231xx_board board;
 
-        unsigned int stream_on:1;           /* Locks streams */
-    unsigned int vbi_stream_on:1;       /* Locks streams for VBI */
+        unsigned int stream_on:1;       /* Locks streams */
+        unsigned int vbi_stream_on:1;   /* Locks streams for VBI */
         unsigned int has_audio_class:1;
         unsigned int has_alsa_audio:1;
 
-    struct cx231xx_fmt *format;
+        struct cx231xx_fmt *format;
 
         struct cx231xx_IR *ir;
 
-        struct list_head        devlist;
+        struct list_head devlist;
 
-        int tuner_type;                     /* type of the tuner */
-        int tuner_addr;                     /* tuner address */
+        int tuner_type;         /* type of the tuner */
+        int tuner_addr;         /* tuner address */
 
-    /* I2C adapters: Master 1 & 2 (External) & Master 3 (Internal only) */
-        struct cx231xx_i2c         i2c_bus[3];
-    unsigned int xc_fw_load_done:1;
-    struct mutex gpio_i2c_lock;
+        /* I2C adapters: Master 1 & 2 (External) & Master 3 (Internal only) */
+        struct cx231xx_i2c i2c_bus[3];
+        unsigned int xc_fw_load_done:1;
+        struct mutex gpio_i2c_lock;
 
         /* video for linux */
-        int users;                              /* user count for exclusive use */
-        struct video_device *vdev;          /* video for linux device struct */
-        v4l2_std_id norm;                   /* selected tv norm */
-        int ctl_freq;                       /* selected frequency */
-        unsigned int ctl_ainput;        /* selected audio input */
+        int users;              /* user count for exclusive use */
+        struct video_device *vdev;      /* video for linux device struct */
+        v4l2_std_id norm;       /* selected tv norm */
+        int ctl_freq;           /* selected frequency */
+        unsigned int ctl_ainput;        /* selected audio input */
         int mute;
         int volume;
 
         /* frame properties */
-        int width;                              /* current frame width */
-        int height;                             /* current frame height */
-        unsigned hscale;                    /* horizontal scale factor (see datasheet) */
-        unsigned vscale;                    /* vertical scale factor (see datasheet) */
-        int interlaced;                     /* 1=interlace fileds, 0=just top fileds */
+        int width;              /* current frame width */
+        int height;             /* current frame height */
+        unsigned hscale;        /* horizontal scale factor (see datasheet) */
+        unsigned vscale;        /* vertical scale factor (see datasheet) */
+        int interlaced;         /* 1=interlace fileds, 0=just top fileds */
 
         struct cx231xx_audio adev;
 
         /* states */
         enum cx231xx_dev_state state;
 
-        struct work_struct         request_module_wk;
+        struct work_struct request_module_wk;
 
         /* locks */
         struct mutex lock;
-        struct mutex ctrl_urb_lock;         /* protects urb_buf */
+        struct mutex ctrl_urb_lock;     /* protects urb_buf */
         struct list_head inqueue, outqueue;
         wait_queue_head_t open, wait_frame, wait_stream;
         struct video_device *vbi_dev;
@@ -500,54 +488,56 @@ struct cx231xx {
 
         unsigned char eedata[256];
 
-    struct cx231xx_video_mode video_mode;
-    struct cx231xx_video_mode vbi_mode;
-    struct cx231xx_video_mode sliced_cc_mode;
-    struct cx231xx_video_mode ts1_mode;
-
-    struct usb_device *udev;        /* the usb device */
-    char urb_buf[URB_MAX_CTRL_SIZE];/* urb control msg buffer */
+        struct cx231xx_video_mode video_mode;
+        struct cx231xx_video_mode vbi_mode;
+        struct cx231xx_video_mode sliced_cc_mode;
+        struct cx231xx_video_mode ts1_mode;
 
+        struct usb_device *udev;        /* the usb device */
+        char urb_buf[URB_MAX_CTRL_SIZE];        /* urb control msg buffer */
 
         /* helper funcs that call usb_control_msg */
-    int (*cx231xx_read_ctrl_reg) (struct cx231xx *dev, u8 req, u16 reg,
-                                        char *buf, int len);
-    int (*cx231xx_write_ctrl_reg)(struct cx231xx *dev, u8 req, u16 reg,
+        int (*cx231xx_read_ctrl_reg) (struct cx231xx * dev, u8 req, u16 reg,
                                       char *buf, int len);
-    int (*cx231xx_send_usb_command)(struct cx231xx_i2c *i2c_bus,
-                   struct cx231xx_i2c_xfer_data *req_data);
-    int (*cx231xx_gpio_i2c_read)(struct cx231xx *dev, u8 dev_addr, u8 *buf ,u8 len);
-    int (*cx231xx_gpio_i2c_write)(struct cx231xx *dev, u8 dev_addr, u8 *buf ,u8 len);
-
-        int (*cx231xx_set_analog_freq)(struct cx231xx *dev, u32 freq ) ;
-    int (*cx231xx_reset_analog_tuner)(struct cx231xx *dev) ;
+        int (*cx231xx_write_ctrl_reg) (struct cx231xx * dev, u8 req, u16 reg,
+                                       char *buf, int len);
+        int (*cx231xx_send_usb_command) (struct cx231xx_i2c * i2c_bus,
+                                         struct cx231xx_i2c_xfer_data *
+                                         req_data);
+        int (*cx231xx_gpio_i2c_read) (struct cx231xx * dev, u8 dev_addr,
+                                      u8 * buf, u8 len);
+        int (*cx231xx_gpio_i2c_write) (struct cx231xx * dev, u8 dev_addr,
+                                       u8 * buf, u8 len);
+
+        int (*cx231xx_set_analog_freq) (struct cx231xx * dev, u32 freq);
+        int (*cx231xx_reset_analog_tuner) (struct cx231xx * dev);
 
         enum cx231xx_mode mode;
 
         struct cx231xx_dvb *dvb;
 
-    /* Cx231xx supported PCB config's */
-    struct pcb_config  current_pcb_config;
-    u8 current_scenario_idx;
-    u8 interface_count;
-    u8 max_iad_interface_count;
+        /* Cx231xx supported PCB config's */
+        struct pcb_config current_pcb_config;
+        u8 current_scenario_idx;
+        u8 interface_count;
+        u8 max_iad_interface_count;
 
-    /* GPIO related register direction and values */
-    u32 gpio_dir;
-    u32 gpio_val;
+        /* GPIO related register direction and values */
+        u32 gpio_dir;
+        u32 gpio_val;
 
-    /* Power Modes */
-    int power_mode;
+        /* Power Modes */
+        int power_mode;
 
-    /* colibri parameters */
-    enum AFE_MODE colibri_mode;
-    u32 colibri_ref_count;
+        /* colibri parameters */
+        enum AFE_MODE colibri_mode;
+        u32 colibri_ref_count;
 
-    /* video related parameters */
-    u32 video_input;
-    u32 active_mode;
-    u8  vbi_or_sliced_cc_mode;          /* 0 - vbi ; 1 - sliced cc mode */
-    enum cx231xx_std_mode std_mode;     /* 0 - Air; 1 - cable */
+        /* video related parameters */
+        u32 video_input;
+        u32 active_mode;
+        u8 vbi_or_sliced_cc_mode;       /* 0 - vbi ; 1 - sliced cc mode */
+        enum cx231xx_std_mode std_mode; /* 0 - Air; 1 - cable */
 
 };
 
@@ -555,29 +545,31 @@ struct cx231xx_ops {
         struct list_head next;
         char *name;
         int id;
-        int (*init)(struct cx231xx *);
-        int (*fini)(struct cx231xx *);
+        int (*init) (struct cx231xx *);
+        int (*fini) (struct cx231xx *);
 };
 
 /* call back functions in dvb module */
-int cx231xx_set_analog_freq(struct cx231xx *dev, u32 freq ) ;
-int cx231xx_reset_analog_tuner(struct cx231xx *dev) ;
+int cx231xx_set_analog_freq(struct cx231xx *dev, u32 freq);
+int cx231xx_reset_analog_tuner(struct cx231xx *dev);
 
 /* Provided by cx231xx-i2c.c */
-void cx231xx_i2c_call_clients(struct cx231xx_i2c *bus, unsigned int cmd, void *arg);
+void cx231xx_i2c_call_clients(struct cx231xx_i2c *bus, unsigned int cmd,
+                              void *arg);
 void cx231xx_do_i2c_scan(struct cx231xx *dev, struct i2c_client *c);
 int cx231xx_i2c_register(struct cx231xx_i2c *bus);
 int cx231xx_i2c_unregister(struct cx231xx_i2c *bus);
 
 /* Internal block control functions */
 int cx231xx_read_i2c_data(struct cx231xx *dev, u8 dev_addr,
-                          u16 saddr, u8 saddr_len, u32 *data, u8 data_len);
+                          u16 saddr, u8 saddr_len, u32 * data, u8 data_len);
 int cx231xx_write_i2c_data(struct cx231xx *dev, u8 dev_addr,
-                          u16 saddr, u8 saddr_len, u32 data, u8 data_len);
-int cx231xx_reg_mask_write(struct cx231xx *dev, u8 dev_addr, u8 size, u16 register_address,
-                           u8 bit_start,u8 bit_end, u32 value);
+                           u16 saddr, u8 saddr_len, u32 data, u8 data_len);
+int cx231xx_reg_mask_write(struct cx231xx *dev, u8 dev_addr, u8 size,
+                           u16 register_address, u8 bit_start, u8 bit_end,
+                           u32 value);
 int cx231xx_read_modify_write_i2c_dword(struct cx231xx *dev, u8 dev_addr,
-                                       u16 saddr, u32 mask, u32 value);
+                                        u16 saddr, u32 mask, u32 value);
 u32 cx231xx_set_field(u32 field_mask, u32 data);
 
 /* Colibri related functions */
@@ -596,23 +588,26 @@ int cx231xx_flatiron_set_audio_input(struct cx231xx *dev, u8 audio_input);
 
 /* DIF related functions */
 int cx231xx_dif_configure_C2HH_for_low_IF(struct cx231xx *dev, u32 mode,
-                                          u32 function_mode, u32 standard);
+                                          u32 function_mode, u32 standard);
 int cx231xx_dif_set_standard(struct cx231xx *dev, u32 standard);
 int cx231xx_tuner_pre_channel_change(struct cx231xx *dev);
 int cx231xx_tuner_post_channel_change(struct cx231xx *dev);
 
 /* video parser functions */
-u8 cx231xx_find_next_SAV_EAV(u8 *p_buffer, u32 buffer_size, u32 *p_bytes_used);
-u8 cx231xx_find_boundary_SAV_EAV(u8 *p_buffer, u8 *partial_buf, u32 *p_bytes_used);
+u8 cx231xx_find_next_SAV_EAV(u8 * p_buffer, u32 buffer_size,
+                             u32 * p_bytes_used);
+u8 cx231xx_find_boundary_SAV_EAV(u8 * p_buffer, u8 * partial_buf,
+                                 u32 * p_bytes_used);
 int cx231xx_do_copy(struct cx231xx *dev, struct cx231xx_dmaqueue *dma_q,
-                    u8 *p_buffer, u32 bytes_to_copy);
-void cx231xx_reset_video_buffer(struct cx231xx *dev, struct cx231xx_dmaqueue  *dma_q);
-u8 cx231xx_is_buffer_done(struct cx231xx *dev,struct cx231xx_dmaqueue  *dma_q);
-u32 cx231xx_copy_video_line(struct cx231xx *dev, struct cx231xx_dmaqueue  *dma_q,
-                            u8 *p_line, u32 length, int field_number);
-u32 cx231xx_get_video_line(struct cx231xx *dev, struct cx231xx_dmaqueue  *dma_q,
-                           u8 sav_eav, u8 *p_buffer, u32 buffer_size);
-void cx231xx_swab(u16 *from, u16 *to, u16 len);
+                    u8 * p_buffer, u32 bytes_to_copy);
+void cx231xx_reset_video_buffer(struct cx231xx *dev,
+                                struct cx231xx_dmaqueue *dma_q);
+u8 cx231xx_is_buffer_done(struct cx231xx *dev, struct cx231xx_dmaqueue *dma_q);
+u32 cx231xx_copy_video_line(struct cx231xx *dev, struct cx231xx_dmaqueue *dma_q,
+                            u8 * p_line, u32 length, int field_number);
+u32 cx231xx_get_video_line(struct cx231xx *dev, struct cx231xx_dmaqueue *dma_q,
+                           u8 sav_eav, u8 * p_buffer, u32 buffer_size);
+void cx231xx_swab(u16 * from, u16 * to, u16 len);
 
 /* Provided by cx231xx-core.c */
 
@@ -622,46 +617,49 @@ void cx231xx_release_buffers(struct cx231xx *dev);
 
 /* read from control pipe */
 int cx231xx_read_ctrl_reg(struct cx231xx *dev, u8 req, u16 reg,
-                            char *buf, int len);
+                          char *buf, int len);
 
 /* write to control pipe */
 int cx231xx_write_ctrl_reg(struct cx231xx *dev, u8 req, u16 reg,
-                                      char *buf, int len);
+                           char *buf, int len);
 int cx231xx_mode_register(struct cx231xx *dev, u16 address, u32 mode);
 
-int cx231xx_send_vendor_cmd(struct cx231xx *dev, VENDOR_REQUEST_IN *ven_req);
+int cx231xx_send_vendor_cmd(struct cx231xx *dev, VENDOR_REQUEST_IN * ven_req);
 int cx231xx_send_usb_command(struct cx231xx_i2c *i2c_bus,
-                   struct cx231xx_i2c_xfer_data *req_data);
+                             struct cx231xx_i2c_xfer_data *req_data);
 
 /* Gpio related functions */
-int cx231xx_send_gpio_cmd(struct cx231xx *dev, u32 gpio_bit, u8* gpio_val,
-                          u8 len, u8 request, u8 direction);
-int cx231xx_set_gpio_bit(struct cx231xx *dev, u32 gpio_bit, u8* gpio_val);
-int cx231xx_get_gpio_bit(struct cx231xx *dev, u32 gpio_bit, u8* gpio_val);
+int cx231xx_send_gpio_cmd(struct cx231xx *dev, u32 gpio_bit, u8 * gpio_val,
+                          u8 len, u8 request, u8 direction);
+int cx231xx_set_gpio_bit(struct cx231xx *dev, u32 gpio_bit, u8 * gpio_val);
+int cx231xx_get_gpio_bit(struct cx231xx *dev, u32 gpio_bit, u8 * gpio_val);
 int cx231xx_set_gpio_value(struct cx231xx *dev, int pin_number, int pin_value);
-int cx231xx_set_gpio_direction(struct cx231xx *dev, int pin_number, int pin_value);
+int cx231xx_set_gpio_direction(struct cx231xx *dev, int pin_number,
+                               int pin_value);
 
 int cx231xx_gpio_i2c_start(struct cx231xx *dev);
 int cx231xx_gpio_i2c_end(struct cx231xx *dev);
 int cx231xx_gpio_i2c_write_byte(struct cx231xx *dev, u8 data);
-int cx231xx_gpio_i2c_read_byte(struct cx231xx *dev, u8 *buf);
+int cx231xx_gpio_i2c_read_byte(struct cx231xx *dev, u8 * buf);
 int cx231xx_gpio_i2c_read_ack(struct cx231xx *dev);
 int cx231xx_gpio_i2c_write_ack(struct cx231xx *dev);
 int cx231xx_gpio_i2c_write_nak(struct cx231xx *dev);
 
-int cx231xx_gpio_i2c_read(struct cx231xx *dev, u8 dev_addr, u8 *buf ,u8 len);
-int cx231xx_gpio_i2c_write(struct cx231xx *dev, u8 dev_addr, u8 *buf ,u8 len);
+int cx231xx_gpio_i2c_read(struct cx231xx *dev, u8 dev_addr, u8 * buf, u8 len);
+int cx231xx_gpio_i2c_write(struct cx231xx *dev, u8 dev_addr, u8 * buf, u8 len);
 
 /* audio related functions */
-int cx231xx_set_audio_decoder_input(struct cx231xx *dev, enum AUDIO_INPUT audio_input);
+int cx231xx_set_audio_decoder_input(struct cx231xx *dev,
+                                    enum AUDIO_INPUT audio_input);
 
 int cx231xx_capture_start(struct cx231xx *dev, int start, u8 media_type);
 int cx231xx_resolution_set(struct cx231xx *dev);
 int cx231xx_set_video_alternate(struct cx231xx *dev);
 int cx231xx_set_alt_setting(struct cx231xx *dev, u8 index, u8 alt);
 int cx231xx_init_isoc(struct cx231xx *dev, int max_packets,
-                     int num_bufs, int max_pkt_size,
-                     int (*isoc_copy) (struct cx231xx *dev, struct urb *urb));
+                      int num_bufs, int max_pkt_size,
+                      int (*isoc_copy) (struct cx231xx * dev,
+                                        struct urb * urb));
 void cx231xx_uninit_isoc(struct cx231xx *dev);
 int cx231xx_set_mode(struct cx231xx *dev, enum cx231xx_mode set_mode);
 int cx231xx_gpio_set(struct cx231xx *dev, struct cx231xx_reg_seq *gpio);
@@ -673,7 +671,7 @@ int cx231xx_register_analog_devices(struct cx231xx *dev);
 void cx231xx_remove_from_devlist(struct cx231xx *dev);
 void cx231xx_add_into_devlist(struct cx231xx *dev);
 struct cx231xx *cx231xx_get_device(int minor,
-                                 enum v4l2_buf_type *fh_type, int *has_radio);
+                                   enum v4l2_buf_type *fh_type, int *has_radio);
 void cx231xx_init_extension(struct cx231xx *dev);
 void cx231xx_close_extension(struct cx231xx *dev);
 
@@ -695,7 +693,8 @@ int cx231xx_power_suspend(struct cx231xx *dev);
 
 /* chip specific control functions */
 int cx231xx_init_ctrl_pin_status(struct cx231xx *dev);
-int cx231xx_set_agc_analog_digital_mux_select(struct cx231xx *dev, u8 analog_or_digital);
+int cx231xx_set_agc_analog_digital_mux_select(struct cx231xx *dev,
+                                              u8 analog_or_digital);
 int cx231xx_enable_i2c_for_tuner(struct cx231xx *dev, u8 I2CIndex);
 
 /* video audio decoder related functions */
@@ -705,8 +704,8 @@ int cx231xx_set_decoder_video_input(struct cx231xx *dev, u8 pin_type, u8 input);
 int cx231xx_do_mode_ctrl_overrides(struct cx231xx *dev);
 int cx231xx_set_audio_input(struct cx231xx *dev, u8 input);
 void get_scale(struct cx231xx *dev,
-                        unsigned int width, unsigned int height,
-                        unsigned int *hscale, unsigned int *vscale);
+               unsigned int width, unsigned int height,
+               unsigned int *hscale, unsigned int *vscale);
 
 /* Provided by cx231xx-video.c */
 int cx231xx_register_extension(struct cx231xx_ops *dev);
@@ -743,7 +742,6 @@ int cx231xx_ir_fini(struct cx231xx *dev);
         printk(KERN_WARNING "%s: "fmt,\
                         dev->name , ##arg); } while (0)
 
-
 static inline unsigned int norm_maxw(struct cx231xx *dev)
 {
         if (dev->board.max_range_640_480)