v4l-dvb: remove legacy checks to allow support for kernels < 2.6.10
authorHans Verkuil <hverkuil@xs4all.nl>
Fri, 18 Jul 2008 03:50:58 +0000 (00:50 -0300)
committerMauro Carvalho Chehab <mchehab@infradead.org>
Sun, 20 Jul 2008 10:17:52 +0000 (07:17 -0300)
Also remove some blank lines that were used to split compat code at -devel
tree.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
58 files changed:
drivers/media/common/ir-functions.c
drivers/media/dvb/dvb-usb/dvb-usb-i2c.c
drivers/media/dvb/ttpci/av7110.c
drivers/media/dvb/ttpci/budget-core.c
drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
drivers/media/video/bt8xx/bt832.c
drivers/media/video/bt8xx/bttv.h
drivers/media/video/bt8xx/bttvp.h
drivers/media/video/cs5345.c
drivers/media/video/cs53l32a.c
drivers/media/video/cx18/cx18-driver.h
drivers/media/video/cx18/cx18-i2c.c
drivers/media/video/cx25840/cx25840-core.c
drivers/media/video/cx88/cx88-alsa.c
drivers/media/video/cx88/cx88-i2c.c
drivers/media/video/cx88/cx88-vp3054-i2c.c
drivers/media/video/em28xx/em28xx-i2c.c
drivers/media/video/gspca/ov519.c
drivers/media/video/ivtv/ivtv-driver.h
drivers/media/video/ivtv/ivtv-i2c.c
drivers/media/video/m52790.c
drivers/media/video/msp3400-driver.c
drivers/media/video/msp3400-kthreads.c
drivers/media/video/pwc/pwc-ctrl.c
drivers/media/video/pwc/pwc-ioctl.h
drivers/media/video/saa5246a.c
drivers/media/video/saa5249.c
drivers/media/video/saa6588.c
drivers/media/video/saa7115.c
drivers/media/video/saa7127.c
drivers/media/video/saa7134/saa6752hs.c
drivers/media/video/saa7134/saa7134-alsa.c
drivers/media/video/saa7134/saa7134-cards.c
drivers/media/video/saa7134/saa7134-core.c
drivers/media/video/saa7134/saa7134-tvaudio.c
drivers/media/video/tda7432.c
drivers/media/video/tda9840.c
drivers/media/video/tda9875.c
drivers/media/video/tea6415c.c
drivers/media/video/tea6420.c
drivers/media/video/tlv320aic23b.c
drivers/media/video/tuner-core.c
drivers/media/video/usbvision/usbvision-core.c
drivers/media/video/usbvision/usbvision-i2c.c
drivers/media/video/usbvision/usbvision-video.c
drivers/media/video/uvc/uvc_ctrl.c
drivers/media/video/uvc/uvc_driver.c
drivers/media/video/uvc/uvc_queue.c
drivers/media/video/uvc/uvc_status.c
drivers/media/video/uvc/uvc_v4l2.c
drivers/media/video/uvc/uvc_video.c
drivers/media/video/uvc/uvcvideo.h
drivers/media/video/videobuf-dvb.c
drivers/media/video/vp27smpx.c
drivers/media/video/wm8739.c
drivers/media/video/wm8775.c
include/media/pwc-ioctl.h
include/media/v4l2-i2c-drv-legacy.h

index 2665052079258c6d015cc42f7109bfd1d11f6b8c..03b1165eacbc3f0d13b13a8d065f261ebca2de09 100644 (file)
@@ -66,7 +66,6 @@ void ir_input_init(struct input_dev *dev, struct ir_input_state *ir,
        if (ir_codes)
                memcpy(ir->ir_codes, ir_codes, sizeof(ir->ir_codes));
 
-
        dev->keycode     = ir->ir_codes;
        dev->keycodesize = sizeof(IR_KEYTAB_TYPE);
        dev->keycodemax  = IR_KEYTAB_SIZE;
index 23428cd307569d8ebdf5d252b0ceed4958356b9c..326f7608954b12e36ef72c1d45a152793a89c5be 100644 (file)
@@ -20,11 +20,7 @@ int dvb_usb_i2c_init(struct dvb_usb_device *d)
        }
 
        strncpy(d->i2c_adap.name, d->desc->name, sizeof(d->i2c_adap.name));
-#ifdef I2C_ADAP_CLASS_TV_DIGITAL
-       d->i2c_adap.class = I2C_ADAP_CLASS_TV_DIGITAL,
-#else
        d->i2c_adap.class = I2C_CLASS_TV_DIGITAL,
-#endif
        d->i2c_adap.algo      = d->props.i2c_algo;
        d->i2c_adap.algo_data = NULL;
        d->i2c_adap.dev.parent = &d->udev->dev;
index 865c4596b7b73d4e7abb333a336d6113fdccced8..0777e8f9544ba66d63402a7f7bc5facd2a73c08c 100644 (file)
@@ -2471,11 +2471,7 @@ static int __devinit av7110_attach(struct saa7146_dev* dev,
           get recognized before the main driver is fully loaded */
        saa7146_write(dev, GPIO_CTRL, 0x500000);
 
-#ifdef I2C_ADAP_CLASS_TV_DIGITAL
-       av7110->i2c_adap.class = I2C_ADAP_CLASS_TV_DIGITAL;
-#else
        av7110->i2c_adap.class = I2C_CLASS_TV_DIGITAL;
-#endif
        strlcpy(av7110->i2c_adap.name, pci_ext->ext_priv, sizeof(av7110->i2c_adap.name));
 
        saa7146_i2c_adapter_prepare(dev, &av7110->i2c_adap, SAA7146_I2C_BUS_BIT_RATE_120); /* 275 kHz */
index 18cac4b12ab28f73fb97a25f219788438b703bee..6f4ddb643fee12482ae84ab0f76939a4fd91999c 100644 (file)
@@ -497,11 +497,7 @@ int ttpci_budget_init(struct budget *budget, struct saa7146_dev *dev,
        if (bi->type != BUDGET_FS_ACTIVY)
                saa7146_write(dev, GPIO_CTRL, 0x500000);        /* GPIO 3 = 1 */
 
-#ifdef I2C_ADAP_CLASS_TV_DIGITAL
-       budget->i2c_adap.class = I2C_ADAP_CLASS_TV_DIGITAL;
-#else
        budget->i2c_adap.class = I2C_CLASS_TV_DIGITAL;
-#endif
 
        strlcpy(budget->i2c_adap.name, budget->card->name, sizeof(budget->i2c_adap.name));
 
index bc2043e44ebdef143d1615dbb9e0b4aab2976753..15607223937495f18a323225b62af65e72ce25e0 100644 (file)
@@ -1693,11 +1693,7 @@ static int ttusb_probe(struct usb_interface *intf, const struct usb_device_id *i
 
        i2c_set_adapdata(&ttusb->i2c_adap, ttusb);
 
-#ifdef I2C_ADAP_CLASS_TV_DIGITAL
-       ttusb->i2c_adap.class             = I2C_ADAP_CLASS_TV_DIGITAL;
-#else
        ttusb->i2c_adap.class             = I2C_CLASS_TV_DIGITAL;
-#endif
        ttusb->i2c_adap.algo              = &ttusb_dec_algo;
        ttusb->i2c_adap.algo_data         = NULL;
        ttusb->i2c_adap.dev.parent        = &udev->dev;
index f92f06dec0d0a2fce3c09965e5e1b8570ca34acd..216fc9680e80c01ebd9762680403ab5b7831cbfd 100644 (file)
@@ -179,7 +179,6 @@ static int bt832_attach(struct i2c_adapter *adap, int addr, int kind)
 
        v4l_info(&t->client,"chip found @ 0x%x\n", addr<<1);
 
-
        if(! bt832_init(&t->client)) {
                bt832_detach(&t->client);
                return -1;
index f2393202904b795a6528fab8745ea821b7627c6a..6d93d16c96e4609cb899da64f4fc12364705cb52 100644 (file)
@@ -299,7 +299,6 @@ extern int bttv_write_gpio(unsigned int card,
 /* ---------------------------------------------------------- */
 /* sysfs/driver-moded based gpio access interface             */
 
-
 struct bttv_sub_device {
        struct device    dev;
        struct bttv_core *core;
index 955e6bcd8ae03fc93b17f5425e1ea460a7543f49..08ef54a22c9e7e843be5b8d8faa5a9789aa4235e 100644 (file)
@@ -39,7 +39,6 @@
 #include <linux/scatterlist.h>
 #include <asm/io.h>
 #include <media/v4l2-common.h>
-
 #include <linux/device.h>
 #include <media/videobuf-dma-sg.h>
 #include <media/tveeprom.h>
@@ -263,12 +262,10 @@ extern struct videobuf_queue_ops bttv_vbi_qops;
 /* ---------------------------------------------------------- */
 /* bttv-gpio.c */
 
-
 extern struct bus_type bttv_sub_bus_type;
 int bttv_sub_add_device(struct bttv_core *core, char *name);
 int bttv_sub_del_devices(struct bttv_core *core);
 
-
 /* ---------------------------------------------------------- */
 /* bttv-driver.c                                              */
 
index 03411503457ed5ca01fc12148aa31049a40a533c..1c3fa3a7470a3f9b7dd3f316aa14fe810d51631a 100644 (file)
@@ -173,4 +173,3 @@ static struct v4l2_i2c_driver_data v4l2_i2c_data = {
        .probe = cs5345_probe,
        .id_table = cs5345_id,
 };
-
index d965af860ab2636dfdc5f6b63da7f8a580237d42..645b339152d34aced2623d59974286736ce9e089 100644 (file)
@@ -43,7 +43,6 @@ MODULE_PARM_DESC(debug, "Debugging messages\n\t\t\t0=Off (default), 1=On");
 
 static unsigned short normal_i2c[] = { 0x22 >> 1, I2C_CLIENT_END };
 
-
 I2C_CLIENT_INSMOD;
 
 /* ----------------------------------------------------------------------- */
@@ -189,4 +188,3 @@ static struct v4l2_i2c_driver_data v4l2_i2c_data = {
        .probe = cs53l32a_probe,
        .id_table = cs53l32a_id,
 };
-
index b421e0268b00eb3df33a2b7f45736cf725a366d7..b78d0e38d53dc29f85f68729a4c7f5162d70985c 100644 (file)
@@ -230,9 +230,7 @@ struct cx18_dvb {
        struct dvb_net dvbnet;
        int enabled;
        int feeding;
-
        struct mutex feedlock;
-
 };
 
 struct cx18;    /* forward reference */
index 3f972e2db705f672a25e6b5ea270e70613d23c5a..6023ba3bd3a63d79d967fdbb86a2fa67611a391c 100644 (file)
 #define GETSCL_BIT      0x0004
 #define GETSDL_BIT      0x0008
 
-#ifndef I2C_ADAP_CLASS_TV_ANALOG
-#define I2C_ADAP_CLASS_TV_ANALOG I2C_CLASS_TV_ANALOG
-#endif
-
 #define CX18_CS5345_I2C_ADDR           0x4c
 
 /* This array should match the CX18_HW_ defines */
index 1da6f134888d6d524ee375d345c75574981706bc..8d5f25caf01b7c315b5b2d28a4ae3f45a07a0cba 100644 (file)
@@ -50,7 +50,6 @@ MODULE_LICENSE("GPL");
 
 static unsigned short normal_i2c[] = { 0x88 >> 1, I2C_CLIENT_END };
 
-
 int cx25840_debug;
 
 module_param_named(debug,cx25840_debug, int, 0644);
index 80c8883e54b5c6ef853d5e8560da3424044376e3..06f171ab61495b4180befde4da18ea8c5a5e14c1 100644 (file)
@@ -82,7 +82,6 @@ typedef struct cx88_audio_dev snd_cx88_card_t;
 
 
 
-
 /****************************************************************************
                        Module global static vars
  ****************************************************************************/
index cb6a096069c7b0fc7a0fcc093dc225d018948ba5..d7406a994f094942924b3726e3b41ba31ac1f19b 100644 (file)
@@ -103,7 +103,6 @@ static int attach_inform(struct i2c_client *client)
 
        dprintk(1, "%s i2c attach [addr=0x%x,client=%s]\n",
                client->driver->driver.name, client->addr, client->name);
-
        return 0;
 }
 
index 6ce5af48847170a12316df9474bbc01f23fd6984..20800425c51ed5d1f5c4e08f82ecaf183d75deec 100644 (file)
@@ -30,7 +30,6 @@
 #include "cx88.h"
 #include "cx88-vp3054-i2c.h"
 
-
 MODULE_DESCRIPTION("driver for cx2388x VP3054 design");
 MODULE_AUTHOR("Chris Pascoe <c.pascoe@itee.uq.edu.au>");
 MODULE_LICENSE("GPL");
index 6a78fd294cabfaef3343ce7fb9b94e85ea031bc0..97853384c9436f0d198d668bb3cdca789125e5ae 100644 (file)
@@ -432,7 +432,6 @@ static u32 functionality(struct i2c_adapter *adap)
        return I2C_FUNC_SMBUS_EMUL;
 }
 
-
 /*
  * attach_inform()
  * gets called when a device attaches to the i2c bus
index 70b4cac37a50bf30a5f1812a336184429731e260..ba245bafcd6fcea722de5306ee6a7b0357c065d3 100644 (file)
@@ -2186,3 +2186,4 @@ module_exit(sd_mod_exit);
 
 module_param(frame_rate, int, 0644);
 MODULE_PARM_DESC(frame_rate, "Frame rate (5, 10, 15, 20 or 30 fps)");
+
index 9d23b1efd36d9c93a1e43db7f378147cddfa136f..a08bb3331cfbd05f7926912dd3fab6bd8daac569 100644 (file)
@@ -635,7 +635,6 @@ struct ivtv {
        spinlock_t lock;                /* lock access to this struct */
        struct mutex serialize_lock;    /* mutex used to serialize open/close/start/stop/ioctl operations */
 
-
        /* Streams */
        int stream_buf_size[IVTV_MAX_STREAMS];          /* stream buffer size */
        struct ivtv_stream streams[IVTV_MAX_STREAMS];   /* stream data */
index 32129f3ea836630e3388ba1ade85b92ee0257b68..a1b37ff8669c5591e7f37600086e3301a3d1f4ca 100644 (file)
 #define IVTV_REG_I2C_GETSCL_OFFSET 0x7008
 #define IVTV_REG_I2C_GETSDA_OFFSET 0x700c
 
-#ifndef I2C_ADAP_CLASS_TV_ANALOG
-#define I2C_ADAP_CLASS_TV_ANALOG I2C_CLASS_TV_ANALOG
-#endif /* I2C_ADAP_CLASS_TV_ANALOG */
-
 #define IVTV_CS53L32A_I2C_ADDR         0x11
 #define IVTV_M52790_I2C_ADDR           0x48
 #define IVTV_CX25840_I2C_ADDR          0x44
index 8e0160d275ca53aaf3ac27874bfa62dcfd3a7799..39bf6b114d50ac348bfdb2b77115e8dfbddec377 100644 (file)
@@ -171,4 +171,3 @@ static struct v4l2_i2c_driver_data v4l2_i2c_data = {
        .remove = m52790_remove,
        .id_table = m52790_id,
 };
-
index 310dbaba55ff325264675a1f56d79f463e2144cd..5691e019d19567d56ba8f9ba1f82a354f55a6ee5 100644 (file)
@@ -110,6 +110,7 @@ MODULE_PARM_DESC(dolby, "Activates Dolby processsing");
 
 /* Addresses to scan */
 static unsigned short normal_i2c[] = { 0x80 >> 1, 0x88 >> 1, I2C_CLIENT_END };
+
 I2C_CLIENT_INSMOD;
 
 /* ----------------------------------------------------------------------- */
@@ -333,7 +334,6 @@ void msp_set_audio(struct i2c_client *client)
 
 /* ------------------------------------------------------------------------ */
 
-
 static void msp_wake_thread(struct i2c_client *client)
 {
        struct msp_state *state = i2c_get_clientdata(client);
@@ -1004,7 +1004,6 @@ static struct v4l2_i2c_driver_data v4l2_i2c_data = {
        .id_table = msp_id,
 };
 
-
 /*
  * Overrides for Emacs so that we follow Linus's tabbing style.
  * ---------------------------------------------------------------------------
index 7f5568592793c836f8a71d78181f83c6dcf2c648..1622f70e4dd0b4244f7f16c098182a4df171a10b 100644 (file)
@@ -480,7 +480,6 @@ int msp3400c_thread(void *data)
        struct msp3400c_carrier_detect *cd;
        int count, max1, max2, val1, val2, val, i;
 
-
        v4l_dbg(1, msp_debug, client, "msp3400 daemon started\n");
        set_freezable();
        for (;;) {
index ea53316d2111fdb2141fc8840755a6b57ce2fe94..1cccd5c77048955502d00fe4732e3999c559914f 100644 (file)
@@ -1255,7 +1255,6 @@ int pwc_get_cmos_sensor(struct pwc_device *pdev, int *sensor)
    exactly the same otherwise.
  */
 
-
 /* define local variable for arg */
 #define ARG_DEF(ARG_type, ARG_name)\
        ARG_type *ARG_name = arg;
@@ -1268,7 +1267,6 @@ int pwc_get_cmos_sensor(struct pwc_device *pdev, int *sensor)
 /* copy local variable to arg */
 #define ARG_OUT(ARG_name) /* nothing */
 
-
 int pwc_ioctl(struct pwc_device *pdev, unsigned int cmd, void *arg)
 {
        int ret = 0;
index cec6602997682fd3aea04be30ee57eb546c5c303..8c0cae7b3dafa3d3014e9de0a4843de03ac99d5e 100644 (file)
@@ -54,7 +54,6 @@
 #include <linux/types.h>
 #include <linux/version.h>
 
-
  /* Enumeration of image sizes */
 #define PSZ_SQCIF      0x00
 #define PSZ_QSIF       0x01
index 996b49491f5a2f29c5ca6c3ed02604a47239faa1..03e772130b55f2edeec58f3febce448b1f970a72 100644 (file)
@@ -66,6 +66,7 @@ static struct video_device saa_template;      /* Declared near bottom */
 
 /* Addresses to scan */
 static unsigned short normal_i2c[]      = { I2C_ADDRESS, I2C_CLIENT_END };
+
 I2C_CLIENT_INSMOD;
 
 static struct i2c_client client_template;
index ec8c65dc8408506ae02786a4dc7e2e982f63f21f..fde99d9ee71f5716f7acdcefcc3625a3cc05c7e6 100644 (file)
@@ -130,6 +130,7 @@ static struct video_device saa_template;    /* Declared near bottom */
 
 /* Addresses to scan */
 static unsigned short normal_i2c[] = {34>>1,I2C_CLIENT_END};
+
 I2C_CLIENT_INSMOD;
 
 static struct i2c_client client_template;
index 716ee7f64df3c017deffdd15dbf899e48fb8840c..f05024259f0150707957dfc37b6e973ae0bcb011 100644 (file)
@@ -31,7 +31,6 @@
 #include <linux/wait.h>
 #include <asm/uaccess.h>
 
-
 #include <media/rds.h>
 
 /* Addresses to scan */
index 435c083cc542af91af65a2fca0cac67cae643e94..f0baca71dd3ed022774a8bd5a28dc6ca265d2ab0 100644 (file)
@@ -67,7 +67,6 @@ static unsigned short normal_i2c[] = {
                0x42 >> 1, 0x40 >> 1,   /* SAA7114, SAA7115 and SAA7118 */
                I2C_CLIENT_END };
 
-
 I2C_CLIENT_INSMOD;
 
 struct saa711x_state {
@@ -1577,4 +1576,3 @@ static struct v4l2_i2c_driver_data v4l2_i2c_data = {
        .legacy_class = I2C_CLASS_TV_ANALOG | I2C_CLASS_TV_DIGITAL,
        .id_table = saa7115_id,
 };
-
index 79d11a658bdfff44b12e9128a0d3e0f5624d6e1d..7ba10e56c609b8588956df4a7351f29b449b8d88 100644 (file)
@@ -753,4 +753,3 @@ static struct v4l2_i2c_driver_data v4l2_i2c_data = {
        .remove = saa7127_remove,
        .id_table = saa7127_id,
 };
-
index fc32c3f68af1ebaae2cc03403a91ef1966ad8861..707be175509dbebcf00f1833ae7fc622e43c7c0d 100644 (file)
@@ -13,7 +13,6 @@
 #include <linux/init.h>
 #include <linux/crc32.h>
 
-
 #define MPEG_VIDEO_TARGET_BITRATE_MAX  27000
 #define MPEG_VIDEO_MAX_BITRATE_MAX     27000
 #define MPEG_TOTAL_TARGET_BITRATE_MAX  27000
@@ -21,6 +20,7 @@
 
 /* Addresses to scan */
 static unsigned short normal_i2c[] = {0x20, I2C_CLIENT_END};
+
 I2C_CLIENT_INSMOD;
 
 MODULE_DESCRIPTION("device driver for saa6752hs MPEG2 encoder");
@@ -707,7 +707,6 @@ static int saa6752hs_attach(struct i2c_adapter *adap, int addr, int kind)
        i2c_attach_client(&h->client);
 
        v4l_info(&h->client,"saa6752hs: chip found @ 0x%x\n", addr<<1);
-
        return 0;
 }
 
index f118de6e36722950b43b5cb21d64520a32386f1f..9929d20320b485b7f5f9740360d599db799ca6ce 100644 (file)
@@ -80,7 +80,6 @@ typedef struct snd_card_saa7134 {
 } snd_card_saa7134_t;
 
 
-
 /*
  * PCM structure
  */
@@ -1121,6 +1120,3 @@ late_initcall(saa7134_alsa_init);
 module_exit(saa7134_alsa_exit);
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Ricardo Cerqueira");
-
-
-
index 932a93cab3ef29e9f36089da2ca8f3080cb282bf..2511d0679c58222ad229e40b256ed276c574455d 100644 (file)
@@ -4220,6 +4220,7 @@ struct saa7134_board saa7134_boards[] = {
                .radio_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
                .radio_addr     = ADDR_UNSET,
+               .mpeg           = SAA7134_MPEG_DVB,
                .inputs         = {{
                        .name = name_tv,
                        .vmux = 1,
@@ -4246,7 +4247,6 @@ struct saa7134_board saa7134_boards[] = {
                .radio_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
                .radio_addr     = ADDR_UNSET,
-               .mpeg           = SAA7134_MPEG_DVB,
                .inputs         = {{
                        .name = name_tv,
                        .vmux = 1,
index 2c19cd0113c8d2e1faa1b54493562b456a8ed3c4..cfee84ee7a88a3e5c0a187ddd96532afe700549d 100644 (file)
@@ -150,7 +150,6 @@ void saa7134_set_gpio(struct saa7134_dev *dev, int bit_no, int value)
 
 #if defined(CONFIG_MODULES) && defined(MODULE)
 
-
 static void request_module_async(struct work_struct *work){
        struct saa7134_dev* dev = container_of(work, struct saa7134_dev, request_module_wk);
        if (card_is_empress(dev))
index 4cc3741c54725dc6b9aeca4d1574ee39bb8eb8d5..c5d0b44c179e02e8b8f66b4cafbb0346771300f3 100644 (file)
@@ -477,7 +477,6 @@ static int tvaudio_thread(void *data)
        unsigned int i, audio, nscan;
        int max1,max2,carrier,rx,mode,lastmode,default_carrier;
 
-
        set_freezable();
 
        for (;;) {
@@ -775,7 +774,6 @@ static int tvaudio_thread_ddep(void *data)
        struct saa7134_dev *dev = data;
        u32 value, norms;
 
-
        set_freezable();
        for (;;) {
                tvaudio_sleep(dev,-1);
index b4d10f7a4e57e3644d5d2bcfd7773f72807dcbb5..ae75c187da79baa0623da0667694aa308a67f015 100644 (file)
@@ -72,6 +72,7 @@ static unsigned short normal_i2c[] = {
        I2C_ADDR_TDA7432 >> 1,
        I2C_CLIENT_END,
 };
+
 I2C_CLIENT_INSMOD;
 
 /* Structure of address and subaddresses for the tda7432 */
index 0cee00242782bb0ec16a0736b822d43370cd9624..2437c1a269c58e98890ecf3f91c811c5d577938f 100644 (file)
@@ -34,6 +34,7 @@
 static int debug;              /* insmod parameter */
 module_param(debug, int, 0644);
 MODULE_PARM_DESC(debug, "Turn on/off device debugging (default:off).");
+
 #define dprintk(args...) \
            do { if (debug) { printk("%s: %s()[%d]: ", KBUILD_MODNAME, __func__, __LINE__); printk(args); } } while (0)
 
index 3c0557130a704ec1084899b18288be3b7a36f514..7a8ce8fb46dc88b4b13116a0875b98a28484af16 100644 (file)
@@ -30,7 +30,6 @@
 #include <linux/i2c.h>
 #include <linux/init.h>
 
-
 #include <media/i2c-addr.h>
 
 static int debug; /* insmod parameter */
@@ -42,6 +41,7 @@ static unsigned short normal_i2c[] =  {
     I2C_ADDR_TDA9875 >> 1,
     I2C_CLIENT_END
 };
+
 I2C_CLIENT_INSMOD;
 
 /* This is a superset of the TDA9875 */
index 9513d8611e8781431db6306fb5a2c8645df19817..421c1445e96cd5210ceddb22d2156b474292aa70 100644 (file)
@@ -36,6 +36,7 @@
 static int debug;              /* insmod parameter */
 module_param(debug, int, 0644);
 MODULE_PARM_DESC(debug, "Turn on/off device debugging (default:off).");
+
 #define dprintk(args...) \
            do { if (debug) { printk("%s: %s()[%d]: ", KBUILD_MODNAME, __func__, __LINE__); printk(args); } } while (0)
 
index 7fd53367c07caef877db4d21b55dbfc8d6355147..b5c8957d130e0115d450c3d0b56ab78b15a9ba03 100644 (file)
@@ -36,6 +36,7 @@
 static int debug;              /* insmod parameter */
 module_param(debug, int, 0644);
 MODULE_PARM_DESC(debug, "Turn on/off device debugging (default:off).");
+
 #define dprintk(args...) \
            do { if (debug) { printk("%s: %s()[%d]: ", KBUILD_MODNAME, __func__, __LINE__); printk(args); } } while (0)
 
index 28ab9f9d760a29aa0317a9ee4eda54a78f2da854..9220378a5637b6233cd0ec665f3c9b41e27e3e9d 100644 (file)
@@ -39,7 +39,6 @@ MODULE_LICENSE("GPL");
 
 static unsigned short normal_i2c[] = { 0x34 >> 1, I2C_CLIENT_END };
 
-
 I2C_CLIENT_INSMOD;
 
 /* ----------------------------------------------------------------------- */
index 0d12ace616658ce8f619d04a1e7815bfaf050a78..93d879dc510f2b5b0d5e0d148696942cb1cfed17 100644 (file)
@@ -1298,7 +1298,6 @@ static struct v4l2_i2c_driver_data v4l2_i2c_data = {
        .id_table = tuner_id,
 };
 
-
 /*
  * Overrides for Emacs so that we follow Linus's tabbing style.
  * ---------------------------------------------------------------------------
index a9c5e5adba3afb704c300df72bbbdfe31a2928b8..abf685464b7ca1f3335af4ca40f76fdaea8bf2aa 100644 (file)
@@ -169,7 +169,6 @@ static void usbvision_rvfree(void *mem, unsigned long size)
 }
 
 
-
 #if ENABLE_HEXDUMP
 static void usbvision_hexdump(const unsigned char *data, int len)
 {
@@ -2317,7 +2316,6 @@ static void usbvision_powerOffTimer(unsigned long data)
        del_timer(&usbvision->powerOffTimer);
        INIT_WORK(&usbvision->powerOffWork, call_usbvision_power_off);
        (void) schedule_work(&usbvision->powerOffWork);
-
 }
 
 void usbvision_init_powerOffTimer(struct usb_usbvision *usbvision)
@@ -2518,7 +2516,6 @@ int usbvision_init_isoc(struct usb_usbvision *usbvision)
                }
        }
 
-
        /* Submit all URBs */
        for (bufIdx = 0; bufIdx < USBVISION_NUMSBUF; bufIdx++) {
                        errCode = usb_submit_urb(usbvision->sbuf[bufIdx].urb,
@@ -2564,7 +2561,6 @@ void usbvision_stop_isoc(struct usb_usbvision *usbvision)
                usbvision->sbuf[bufIdx].urb = NULL;
        }
 
-
        PDEBUG(DBG_ISOC, "%s: streaming=Stream_Off\n", __func__);
        usbvision->streaming = Stream_Off;
 
index e2274d77ea295a532befda800eec9ab53e14eb0c..a6d00858b07ecad47da68bf54ccb06280fe55352 100644 (file)
@@ -190,7 +190,6 @@ static u32 functionality(struct i2c_adapter *adap)
        return I2C_FUNC_SMBUS_EMUL | I2C_FUNC_10BIT_ADDR;
 }
 
-
 /* -----exported algorithm data: ------------------------------------- */
 
 static struct i2c_algorithm usbvision_algo = {
@@ -514,11 +513,7 @@ static struct i2c_adapter i2c_adap_template = {
        .id                = I2C_HW_B_BT848, /* FIXME */
        .client_register   = attach_inform,
        .client_unregister = detach_inform,
-#ifdef I2C_ADAP_CLASS_TV_ANALOG
-       .class             = I2C_ADAP_CLASS_TV_ANALOG,
-#else
        .class             = I2C_CLASS_TV_ANALOG,
-#endif
 };
 
 static struct i2c_client i2c_client_template = {
index a9e5e08caec5fc4ac15655522bbe9b51a7f92a27..cd6c41d67899280d9628e3f4e29fd3e57826866d 100644 (file)
@@ -179,7 +179,6 @@ MODULE_ALIAS(DRIVER_ALIAS);
 /*   /sys/bus/usb/drivers/USBVision Video Grabber                            */
 /*****************************************************************************/
 
-
 #define YES_NO(x) ((x) ? "Yes" : "No")
 
 static inline struct usb_usbvision *cd_to_usbvision(struct device *cd)
@@ -370,7 +369,6 @@ static void usbvision_remove_sysfs(struct video_device *vdev)
        }
 }
 
-
 /*
  * usbvision_open()
  *
@@ -388,7 +386,6 @@ static int usbvision_v4l2_open(struct inode *inode, struct file *file)
 
        PDEBUG(DBG_IO, "open");
 
-
        usbvision_reset_powerOffTimer(usbvision);
 
        if (usbvision->user)
@@ -442,9 +439,6 @@ static int usbvision_v4l2_open(struct inode *inode, struct file *file)
                mutex_unlock(&usbvision->lock);
        }
 
-       if (errCode) {
-       }
-
        /* prepare queues */
        usbvision_empty_framequeues(usbvision);
 
@@ -495,8 +489,6 @@ static int usbvision_v4l2_close(struct inode *inode, struct file *file)
        }
 
        PDEBUG(DBG_IO, "success");
-
-
        return 0;
 }
 
@@ -1346,9 +1338,7 @@ static int usbvision_radio_close(struct inode *inode, struct file *file)
                usbvision_release(usbvision);
        }
 
-
        PDEBUG(DBG_IO, "success");
-
        return errCode;
 }
 
@@ -1360,7 +1350,6 @@ static int usbvision_vbi_open(struct inode *inode, struct file *file)
 {
        /* TODO */
        return -ENODEV;
-
 }
 
 static int usbvision_vbi_close(struct inode *inode, struct file *file)
@@ -1899,7 +1888,6 @@ static void __devexit usbvision_disconnect(struct usb_interface *intf)
        }
 
        PDEBUG(DBG_PROBE, "success");
-
 }
 
 static struct usb_driver usbvision_driver = {
index f0ee46d15540032bb4bff37293858031d0a01d58..3ae95512666f7685b54da8e495845cb44844a5e6 100644 (file)
@@ -1254,3 +1254,4 @@ void uvc_ctrl_init(void)
        for (; mapping < mend; ++mapping)
                uvc_ctrl_add_mapping(mapping);
 }
+
index 86bb16d001730a61b51776ab48130ae210d16036..31a0e706a7f6693f470efa6d9a1879fb2a4ada66 100644 (file)
@@ -1954,3 +1954,4 @@ MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);
 MODULE_LICENSE("GPL");
 MODULE_VERSION(DRIVER_VERSION);
+
index 0923f0e3b3d4efa4646eb64a79aaa34579466e14..7388d0cee3d4745c2b9aa415c355a47a49b4df2e 100644 (file)
@@ -475,3 +475,4 @@ struct uvc_buffer *uvc_queue_next_buffer(struct uvc_video_queue *queue,
        wake_up(&buf->wait);
        return nextbuf;
 }
+
index 06b47980ed98bdf71e5fa52969f2d58f67b68a68..7bfddad37d8c8ff50d0dc8209d33f9216daf5a31 100644 (file)
@@ -205,3 +205,4 @@ int uvc_status_resume(struct uvc_device *dev)
 
        return usb_submit_urb(dev->int_urb, GFP_NOIO);
 }
+
index 2e0a66575bb4af709da78f4f4071b4408a755dc6..0456bbdcd69533975f7fda3dc10125c1a4e27402 100644 (file)
@@ -1103,3 +1103,4 @@ struct file_operations uvc_fops = {
        .mmap           = uvc_v4l2_mmap,
        .poll           = uvc_v4l2_poll,
 };
+
index 817af2e36362264be4644d77518f5ae30cb1d18c..ad63794fda7784e2380bd4e1dd9248b39a74c857 100644 (file)
@@ -964,3 +964,4 @@ int uvc_video_enable(struct uvc_video_device *video, int enable)
 
        return uvc_init_video(video, GFP_KERNEL);
 }
+
index 2444b8a9d2a06ad5f625f92803dde1f9d82b5913..bafe3406e305bd035465851bdd70bd5438b1349a 100644 (file)
@@ -796,3 +796,4 @@ void uvc_video_decode_isight(struct urb *urb, struct uvc_video_device *video,
 #endif /* __KERNEL__ */
 
 #endif
+
index 6e4d73ec6855f274684df7e4b80cea0d4b9b0bd4..b56cffcbfd458152829b0973ade0f6646380aee8 100644 (file)
@@ -13,7 +13,6 @@
  * (at your option) any later version.
  */
 
-
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/device.h>
@@ -257,4 +256,3 @@ EXPORT_SYMBOL(videobuf_dvb_unregister);
  * compile-command: "make DVB=1"
  * End:
  */
-
index a1f76ee032e71c65725d39651235bc3a7de7c5aa..cbecb3cbbbaa83b9a6e1f5ddfe9283427f9af830 100644 (file)
@@ -166,4 +166,3 @@ static struct v4l2_i2c_driver_data v4l2_i2c_data = {
        .remove = vp27smpx_remove,
        .id_table = vp27smpx_id,
 };
-
index fc50299caa36f8f1715160a2499392efe77a2551..7be47a255853e13c1bedcb1439ba91844697ab9a 100644 (file)
@@ -327,4 +327,3 @@ static struct v4l2_i2c_driver_data v4l2_i2c_data = {
        .remove = wm8739_remove,
        .id_table = wm8739_id,
 };
-
index 506378a508b906e270f636be6748517c3bf8b875..c2ab70a04a740455c3da62ae421a6e6e3ee9db56 100644 (file)
@@ -42,7 +42,6 @@ MODULE_LICENSE("GPL");
 
 static unsigned short normal_i2c[] = { 0x36 >> 1, I2C_CLIENT_END };
 
-
 I2C_CLIENT_INSMOD;
 
 
@@ -230,4 +229,3 @@ static struct v4l2_i2c_driver_data v4l2_i2c_data = {
        .remove = wm8775_remove,
        .id_table = wm8775_id,
 };
-
index adc1254e887e3ae0d1fd8ae79a5eb01ab9df7b3d..0f19779c463453b83725c9a0599e72218994dcb7 100644 (file)
@@ -55,8 +55,7 @@
 #include <linux/types.h>
 #include <linux/version.h>
 
-
- /* Enumeration of image sizes */
+/* Enumeration of image sizes */
 #define PSZ_SQCIF      0x00
 #define PSZ_QSIF       0x01
 #define PSZ_QCIF       0x02
index 878562278b674588577c88bfeb22cb7858bbd29c..975ffbf4e2c537a93cd6e9fc50de12df0c1a104b 100644 (file)
@@ -68,7 +68,6 @@ static int v4l2_i2c_drv_detach_legacy(struct i2c_client *client)
        if (err)
                return err;
        kfree(client);
-
        return 0;
 }