aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/common/ir-functions.c1
-rw-r--r--drivers/media/dvb/dvb-usb/dvb-usb-i2c.c4
-rw-r--r--drivers/media/dvb/ttpci/av7110.c4
-rw-r--r--drivers/media/dvb/ttpci/budget-core.c4
-rw-r--r--drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c4
-rw-r--r--drivers/media/video/bt8xx/bt832.c1
-rw-r--r--drivers/media/video/bt8xx/bttv.h1
-rw-r--r--drivers/media/video/bt8xx/bttvp.h3
-rw-r--r--drivers/media/video/cs5345.c1
-rw-r--r--drivers/media/video/cs53l32a.c2
-rw-r--r--drivers/media/video/cx18/cx18-driver.h2
-rw-r--r--drivers/media/video/cx18/cx18-i2c.c4
-rw-r--r--drivers/media/video/cx25840/cx25840-core.c1
-rw-r--r--drivers/media/video/cx88/cx88-alsa.c1
-rw-r--r--drivers/media/video/cx88/cx88-i2c.c1
-rw-r--r--drivers/media/video/cx88/cx88-vp3054-i2c.c1
-rw-r--r--drivers/media/video/em28xx/em28xx-i2c.c1
-rw-r--r--drivers/media/video/gspca/ov519.c1
-rw-r--r--drivers/media/video/ivtv/ivtv-driver.h1
-rw-r--r--drivers/media/video/ivtv/ivtv-i2c.c4
-rw-r--r--drivers/media/video/m52790.c1
-rw-r--r--drivers/media/video/msp3400-driver.c3
-rw-r--r--drivers/media/video/msp3400-kthreads.c1
-rw-r--r--drivers/media/video/pwc/pwc-ctrl.c2
-rw-r--r--drivers/media/video/pwc/pwc-ioctl.h1
-rw-r--r--drivers/media/video/saa5246a.c1
-rw-r--r--drivers/media/video/saa5249.c1
-rw-r--r--drivers/media/video/saa6588.c1
-rw-r--r--drivers/media/video/saa7115.c2
-rw-r--r--drivers/media/video/saa7127.c1
-rw-r--r--drivers/media/video/saa7134/saa6752hs.c3
-rw-r--r--drivers/media/video/saa7134/saa7134-alsa.c4
-rw-r--r--drivers/media/video/saa7134/saa7134-cards.c2
-rw-r--r--drivers/media/video/saa7134/saa7134-core.c1
-rw-r--r--drivers/media/video/saa7134/saa7134-tvaudio.c2
-rw-r--r--drivers/media/video/tda7432.c1
-rw-r--r--drivers/media/video/tda9840.c1
-rw-r--r--drivers/media/video/tda9875.c2
-rw-r--r--drivers/media/video/tea6415c.c1
-rw-r--r--drivers/media/video/tea6420.c1
-rw-r--r--drivers/media/video/tlv320aic23b.c1
-rw-r--r--drivers/media/video/tuner-core.c1
-rw-r--r--drivers/media/video/usbvision/usbvision-core.c4
-rw-r--r--drivers/media/video/usbvision/usbvision-i2c.c5
-rw-r--r--drivers/media/video/usbvision/usbvision-video.c12
-rw-r--r--drivers/media/video/uvc/uvc_ctrl.c1
-rw-r--r--drivers/media/video/uvc/uvc_driver.c1
-rw-r--r--drivers/media/video/uvc/uvc_queue.c1
-rw-r--r--drivers/media/video/uvc/uvc_status.c1
-rw-r--r--drivers/media/video/uvc/uvc_v4l2.c1
-rw-r--r--drivers/media/video/uvc/uvc_video.c1
-rw-r--r--drivers/media/video/uvc/uvcvideo.h1
-rw-r--r--drivers/media/video/videobuf-dvb.c2
-rw-r--r--drivers/media/video/vp27smpx.c1
-rw-r--r--drivers/media/video/wm8739.c1
-rw-r--r--drivers/media/video/wm8775.c2
56 files changed, 18 insertions, 92 deletions
diff --git a/drivers/media/common/ir-functions.c b/drivers/media/common/ir-functions.c
index 266505207925..03b1165eacbc 100644
--- a/drivers/media/common/ir-functions.c
+++ b/drivers/media/common/ir-functions.c
@@ -66,7 +66,6 @@ void ir_input_init(struct input_dev *dev, struct ir_input_state *ir,
66 if (ir_codes) 66 if (ir_codes)
67 memcpy(ir->ir_codes, ir_codes, sizeof(ir->ir_codes)); 67 memcpy(ir->ir_codes, ir_codes, sizeof(ir->ir_codes));
68 68
69
70 dev->keycode = ir->ir_codes; 69 dev->keycode = ir->ir_codes;
71 dev->keycodesize = sizeof(IR_KEYTAB_TYPE); 70 dev->keycodesize = sizeof(IR_KEYTAB_TYPE);
72 dev->keycodemax = IR_KEYTAB_SIZE; 71 dev->keycodemax = IR_KEYTAB_SIZE;
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c b/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c
index 23428cd30756..326f7608954b 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c
@@ -20,11 +20,7 @@ int dvb_usb_i2c_init(struct dvb_usb_device *d)
20 } 20 }
21 21
22 strncpy(d->i2c_adap.name, d->desc->name, sizeof(d->i2c_adap.name)); 22 strncpy(d->i2c_adap.name, d->desc->name, sizeof(d->i2c_adap.name));
23#ifdef I2C_ADAP_CLASS_TV_DIGITAL
24 d->i2c_adap.class = I2C_ADAP_CLASS_TV_DIGITAL,
25#else
26 d->i2c_adap.class = I2C_CLASS_TV_DIGITAL, 23 d->i2c_adap.class = I2C_CLASS_TV_DIGITAL,
27#endif
28 d->i2c_adap.algo = d->props.i2c_algo; 24 d->i2c_adap.algo = d->props.i2c_algo;
29 d->i2c_adap.algo_data = NULL; 25 d->i2c_adap.algo_data = NULL;
30 d->i2c_adap.dev.parent = &d->udev->dev; 26 d->i2c_adap.dev.parent = &d->udev->dev;
diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c
index 865c4596b7b7..0777e8f9544b 100644
--- a/drivers/media/dvb/ttpci/av7110.c
+++ b/drivers/media/dvb/ttpci/av7110.c
@@ -2471,11 +2471,7 @@ static int __devinit av7110_attach(struct saa7146_dev* dev,
2471 get recognized before the main driver is fully loaded */ 2471 get recognized before the main driver is fully loaded */
2472 saa7146_write(dev, GPIO_CTRL, 0x500000); 2472 saa7146_write(dev, GPIO_CTRL, 0x500000);
2473 2473
2474#ifdef I2C_ADAP_CLASS_TV_DIGITAL
2475 av7110->i2c_adap.class = I2C_ADAP_CLASS_TV_DIGITAL;
2476#else
2477 av7110->i2c_adap.class = I2C_CLASS_TV_DIGITAL; 2474 av7110->i2c_adap.class = I2C_CLASS_TV_DIGITAL;
2478#endif
2479 strlcpy(av7110->i2c_adap.name, pci_ext->ext_priv, sizeof(av7110->i2c_adap.name)); 2475 strlcpy(av7110->i2c_adap.name, pci_ext->ext_priv, sizeof(av7110->i2c_adap.name));
2480 2476
2481 saa7146_i2c_adapter_prepare(dev, &av7110->i2c_adap, SAA7146_I2C_BUS_BIT_RATE_120); /* 275 kHz */ 2477 saa7146_i2c_adapter_prepare(dev, &av7110->i2c_adap, SAA7146_I2C_BUS_BIT_RATE_120); /* 275 kHz */
diff --git a/drivers/media/dvb/ttpci/budget-core.c b/drivers/media/dvb/ttpci/budget-core.c
index 18cac4b12ab2..6f4ddb643fee 100644
--- a/drivers/media/dvb/ttpci/budget-core.c
+++ b/drivers/media/dvb/ttpci/budget-core.c
@@ -497,11 +497,7 @@ int ttpci_budget_init(struct budget *budget, struct saa7146_dev *dev,
497 if (bi->type != BUDGET_FS_ACTIVY) 497 if (bi->type != BUDGET_FS_ACTIVY)
498 saa7146_write(dev, GPIO_CTRL, 0x500000); /* GPIO 3 = 1 */ 498 saa7146_write(dev, GPIO_CTRL, 0x500000); /* GPIO 3 = 1 */
499 499
500#ifdef I2C_ADAP_CLASS_TV_DIGITAL
501 budget->i2c_adap.class = I2C_ADAP_CLASS_TV_DIGITAL;
502#else
503 budget->i2c_adap.class = I2C_CLASS_TV_DIGITAL; 500 budget->i2c_adap.class = I2C_CLASS_TV_DIGITAL;
504#endif
505 501
506 strlcpy(budget->i2c_adap.name, budget->card->name, sizeof(budget->i2c_adap.name)); 502 strlcpy(budget->i2c_adap.name, budget->card->name, sizeof(budget->i2c_adap.name));
507 503
diff --git a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
index bc2043e44ebd..156072239374 100644
--- a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
+++ b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
@@ -1693,11 +1693,7 @@ static int ttusb_probe(struct usb_interface *intf, const struct usb_device_id *i
1693 1693
1694 i2c_set_adapdata(&ttusb->i2c_adap, ttusb); 1694 i2c_set_adapdata(&ttusb->i2c_adap, ttusb);
1695 1695
1696#ifdef I2C_ADAP_CLASS_TV_DIGITAL
1697 ttusb->i2c_adap.class = I2C_ADAP_CLASS_TV_DIGITAL;
1698#else
1699 ttusb->i2c_adap.class = I2C_CLASS_TV_DIGITAL; 1696 ttusb->i2c_adap.class = I2C_CLASS_TV_DIGITAL;
1700#endif
1701 ttusb->i2c_adap.algo = &ttusb_dec_algo; 1697 ttusb->i2c_adap.algo = &ttusb_dec_algo;
1702 ttusb->i2c_adap.algo_data = NULL; 1698 ttusb->i2c_adap.algo_data = NULL;
1703 ttusb->i2c_adap.dev.parent = &udev->dev; 1699 ttusb->i2c_adap.dev.parent = &udev->dev;
diff --git a/drivers/media/video/bt8xx/bt832.c b/drivers/media/video/bt8xx/bt832.c
index f92f06dec0d0..216fc9680e80 100644
--- a/drivers/media/video/bt8xx/bt832.c
+++ b/drivers/media/video/bt8xx/bt832.c
@@ -179,7 +179,6 @@ static int bt832_attach(struct i2c_adapter *adap, int addr, int kind)
179 179
180 v4l_info(&t->client,"chip found @ 0x%x\n", addr<<1); 180 v4l_info(&t->client,"chip found @ 0x%x\n", addr<<1);
181 181
182
183 if(! bt832_init(&t->client)) { 182 if(! bt832_init(&t->client)) {
184 bt832_detach(&t->client); 183 bt832_detach(&t->client);
185 return -1; 184 return -1;
diff --git a/drivers/media/video/bt8xx/bttv.h b/drivers/media/video/bt8xx/bttv.h
index f2393202904b..6d93d16c96e4 100644
--- a/drivers/media/video/bt8xx/bttv.h
+++ b/drivers/media/video/bt8xx/bttv.h
@@ -299,7 +299,6 @@ extern int bttv_write_gpio(unsigned int card,
299/* ---------------------------------------------------------- */ 299/* ---------------------------------------------------------- */
300/* sysfs/driver-moded based gpio access interface */ 300/* sysfs/driver-moded based gpio access interface */
301 301
302
303struct bttv_sub_device { 302struct bttv_sub_device {
304 struct device dev; 303 struct device dev;
305 struct bttv_core *core; 304 struct bttv_core *core;
diff --git a/drivers/media/video/bt8xx/bttvp.h b/drivers/media/video/bt8xx/bttvp.h
index 955e6bcd8ae0..08ef54a22c9e 100644
--- a/drivers/media/video/bt8xx/bttvp.h
+++ b/drivers/media/video/bt8xx/bttvp.h
@@ -39,7 +39,6 @@
39#include <linux/scatterlist.h> 39#include <linux/scatterlist.h>
40#include <asm/io.h> 40#include <asm/io.h>
41#include <media/v4l2-common.h> 41#include <media/v4l2-common.h>
42
43#include <linux/device.h> 42#include <linux/device.h>
44#include <media/videobuf-dma-sg.h> 43#include <media/videobuf-dma-sg.h>
45#include <media/tveeprom.h> 44#include <media/tveeprom.h>
@@ -263,12 +262,10 @@ extern struct videobuf_queue_ops bttv_vbi_qops;
263/* ---------------------------------------------------------- */ 262/* ---------------------------------------------------------- */
264/* bttv-gpio.c */ 263/* bttv-gpio.c */
265 264
266
267extern struct bus_type bttv_sub_bus_type; 265extern struct bus_type bttv_sub_bus_type;
268int bttv_sub_add_device(struct bttv_core *core, char *name); 266int bttv_sub_add_device(struct bttv_core *core, char *name);
269int bttv_sub_del_devices(struct bttv_core *core); 267int bttv_sub_del_devices(struct bttv_core *core);
270 268
271
272/* ---------------------------------------------------------- */ 269/* ---------------------------------------------------------- */
273/* bttv-driver.c */ 270/* bttv-driver.c */
274 271
diff --git a/drivers/media/video/cs5345.c b/drivers/media/video/cs5345.c
index 03411503457e..1c3fa3a7470a 100644
--- a/drivers/media/video/cs5345.c
+++ b/drivers/media/video/cs5345.c
@@ -173,4 +173,3 @@ static struct v4l2_i2c_driver_data v4l2_i2c_data = {
173 .probe = cs5345_probe, 173 .probe = cs5345_probe,
174 .id_table = cs5345_id, 174 .id_table = cs5345_id,
175}; 175};
176
diff --git a/drivers/media/video/cs53l32a.c b/drivers/media/video/cs53l32a.c
index d965af860ab2..645b339152d3 100644
--- a/drivers/media/video/cs53l32a.c
+++ b/drivers/media/video/cs53l32a.c
@@ -43,7 +43,6 @@ MODULE_PARM_DESC(debug, "Debugging messages\n\t\t\t0=Off (default), 1=On");
43 43
44static unsigned short normal_i2c[] = { 0x22 >> 1, I2C_CLIENT_END }; 44static unsigned short normal_i2c[] = { 0x22 >> 1, I2C_CLIENT_END };
45 45
46
47I2C_CLIENT_INSMOD; 46I2C_CLIENT_INSMOD;
48 47
49/* ----------------------------------------------------------------------- */ 48/* ----------------------------------------------------------------------- */
@@ -189,4 +188,3 @@ static struct v4l2_i2c_driver_data v4l2_i2c_data = {
189 .probe = cs53l32a_probe, 188 .probe = cs53l32a_probe,
190 .id_table = cs53l32a_id, 189 .id_table = cs53l32a_id,
191}; 190};
192
diff --git a/drivers/media/video/cx18/cx18-driver.h b/drivers/media/video/cx18/cx18-driver.h
index b421e0268b00..b78d0e38d53d 100644
--- a/drivers/media/video/cx18/cx18-driver.h
+++ b/drivers/media/video/cx18/cx18-driver.h
@@ -230,9 +230,7 @@ struct cx18_dvb {
230 struct dvb_net dvbnet; 230 struct dvb_net dvbnet;
231 int enabled; 231 int enabled;
232 int feeding; 232 int feeding;
233
234 struct mutex feedlock; 233 struct mutex feedlock;
235
236}; 234};
237 235
238struct cx18; /* forward reference */ 236struct cx18; /* forward reference */
diff --git a/drivers/media/video/cx18/cx18-i2c.c b/drivers/media/video/cx18/cx18-i2c.c
index 3f972e2db705..6023ba3bd3a6 100644
--- a/drivers/media/video/cx18/cx18-i2c.c
+++ b/drivers/media/video/cx18/cx18-i2c.c
@@ -39,10 +39,6 @@
39#define GETSCL_BIT 0x0004 39#define GETSCL_BIT 0x0004
40#define GETSDL_BIT 0x0008 40#define GETSDL_BIT 0x0008
41 41
42#ifndef I2C_ADAP_CLASS_TV_ANALOG
43#define I2C_ADAP_CLASS_TV_ANALOG I2C_CLASS_TV_ANALOG
44#endif
45
46#define CX18_CS5345_I2C_ADDR 0x4c 42#define CX18_CS5345_I2C_ADDR 0x4c
47 43
48/* This array should match the CX18_HW_ defines */ 44/* This array should match the CX18_HW_ defines */
diff --git a/drivers/media/video/cx25840/cx25840-core.c b/drivers/media/video/cx25840/cx25840-core.c
index 1da6f134888d..8d5f25caf01b 100644
--- a/drivers/media/video/cx25840/cx25840-core.c
+++ b/drivers/media/video/cx25840/cx25840-core.c
@@ -50,7 +50,6 @@ MODULE_LICENSE("GPL");
50 50
51static unsigned short normal_i2c[] = { 0x88 >> 1, I2C_CLIENT_END }; 51static unsigned short normal_i2c[] = { 0x88 >> 1, I2C_CLIENT_END };
52 52
53
54int cx25840_debug; 53int cx25840_debug;
55 54
56module_param_named(debug,cx25840_debug, int, 0644); 55module_param_named(debug,cx25840_debug, int, 0644);
diff --git a/drivers/media/video/cx88/cx88-alsa.c b/drivers/media/video/cx88/cx88-alsa.c
index 80c8883e54b5..06f171ab6149 100644
--- a/drivers/media/video/cx88/cx88-alsa.c
+++ b/drivers/media/video/cx88/cx88-alsa.c
@@ -82,7 +82,6 @@ typedef struct cx88_audio_dev snd_cx88_card_t;
82 82
83 83
84 84
85
86/**************************************************************************** 85/****************************************************************************
87 Module global static vars 86 Module global static vars
88 ****************************************************************************/ 87 ****************************************************************************/
diff --git a/drivers/media/video/cx88/cx88-i2c.c b/drivers/media/video/cx88/cx88-i2c.c
index cb6a096069c7..d7406a994f09 100644
--- a/drivers/media/video/cx88/cx88-i2c.c
+++ b/drivers/media/video/cx88/cx88-i2c.c
@@ -103,7 +103,6 @@ static int attach_inform(struct i2c_client *client)
103 103
104 dprintk(1, "%s i2c attach [addr=0x%x,client=%s]\n", 104 dprintk(1, "%s i2c attach [addr=0x%x,client=%s]\n",
105 client->driver->driver.name, client->addr, client->name); 105 client->driver->driver.name, client->addr, client->name);
106
107 return 0; 106 return 0;
108} 107}
109 108
diff --git a/drivers/media/video/cx88/cx88-vp3054-i2c.c b/drivers/media/video/cx88/cx88-vp3054-i2c.c
index 6ce5af488471..20800425c51e 100644
--- a/drivers/media/video/cx88/cx88-vp3054-i2c.c
+++ b/drivers/media/video/cx88/cx88-vp3054-i2c.c
@@ -30,7 +30,6 @@
30#include "cx88.h" 30#include "cx88.h"
31#include "cx88-vp3054-i2c.h" 31#include "cx88-vp3054-i2c.h"
32 32
33
34MODULE_DESCRIPTION("driver for cx2388x VP3054 design"); 33MODULE_DESCRIPTION("driver for cx2388x VP3054 design");
35MODULE_AUTHOR("Chris Pascoe <c.pascoe@itee.uq.edu.au>"); 34MODULE_AUTHOR("Chris Pascoe <c.pascoe@itee.uq.edu.au>");
36MODULE_LICENSE("GPL"); 35MODULE_LICENSE("GPL");
diff --git a/drivers/media/video/em28xx/em28xx-i2c.c b/drivers/media/video/em28xx/em28xx-i2c.c
index 6a78fd294cab..97853384c943 100644
--- a/drivers/media/video/em28xx/em28xx-i2c.c
+++ b/drivers/media/video/em28xx/em28xx-i2c.c
@@ -432,7 +432,6 @@ static u32 functionality(struct i2c_adapter *adap)
432 return I2C_FUNC_SMBUS_EMUL; 432 return I2C_FUNC_SMBUS_EMUL;
433} 433}
434 434
435
436/* 435/*
437 * attach_inform() 436 * attach_inform()
438 * gets called when a device attaches to the i2c bus 437 * gets called when a device attaches to the i2c bus
diff --git a/drivers/media/video/gspca/ov519.c b/drivers/media/video/gspca/ov519.c
index 70b4cac37a50..ba245bafcd6f 100644
--- a/drivers/media/video/gspca/ov519.c
+++ b/drivers/media/video/gspca/ov519.c
@@ -2186,3 +2186,4 @@ module_exit(sd_mod_exit);
2186 2186
2187module_param(frame_rate, int, 0644); 2187module_param(frame_rate, int, 0644);
2188MODULE_PARM_DESC(frame_rate, "Frame rate (5, 10, 15, 20 or 30 fps)"); 2188MODULE_PARM_DESC(frame_rate, "Frame rate (5, 10, 15, 20 or 30 fps)");
2189
diff --git a/drivers/media/video/ivtv/ivtv-driver.h b/drivers/media/video/ivtv/ivtv-driver.h
index 9d23b1efd36d..a08bb3331cfb 100644
--- a/drivers/media/video/ivtv/ivtv-driver.h
+++ b/drivers/media/video/ivtv/ivtv-driver.h
@@ -635,7 +635,6 @@ struct ivtv {
635 spinlock_t lock; /* lock access to this struct */ 635 spinlock_t lock; /* lock access to this struct */
636 struct mutex serialize_lock; /* mutex used to serialize open/close/start/stop/ioctl operations */ 636 struct mutex serialize_lock; /* mutex used to serialize open/close/start/stop/ioctl operations */
637 637
638
639 /* Streams */ 638 /* Streams */
640 int stream_buf_size[IVTV_MAX_STREAMS]; /* stream buffer size */ 639 int stream_buf_size[IVTV_MAX_STREAMS]; /* stream buffer size */
641 struct ivtv_stream streams[IVTV_MAX_STREAMS]; /* stream data */ 640 struct ivtv_stream streams[IVTV_MAX_STREAMS]; /* stream data */
diff --git a/drivers/media/video/ivtv/ivtv-i2c.c b/drivers/media/video/ivtv/ivtv-i2c.c
index 32129f3ea836..a1b37ff8669c 100644
--- a/drivers/media/video/ivtv/ivtv-i2c.c
+++ b/drivers/media/video/ivtv/ivtv-i2c.c
@@ -75,10 +75,6 @@
75#define IVTV_REG_I2C_GETSCL_OFFSET 0x7008 75#define IVTV_REG_I2C_GETSCL_OFFSET 0x7008
76#define IVTV_REG_I2C_GETSDA_OFFSET 0x700c 76#define IVTV_REG_I2C_GETSDA_OFFSET 0x700c
77 77
78#ifndef I2C_ADAP_CLASS_TV_ANALOG
79#define I2C_ADAP_CLASS_TV_ANALOG I2C_CLASS_TV_ANALOG
80#endif /* I2C_ADAP_CLASS_TV_ANALOG */
81
82#define IVTV_CS53L32A_I2C_ADDR 0x11 78#define IVTV_CS53L32A_I2C_ADDR 0x11
83#define IVTV_M52790_I2C_ADDR 0x48 79#define IVTV_M52790_I2C_ADDR 0x48
84#define IVTV_CX25840_I2C_ADDR 0x44 80#define IVTV_CX25840_I2C_ADDR 0x44
diff --git a/drivers/media/video/m52790.c b/drivers/media/video/m52790.c
index 8e0160d275ca..39bf6b114d50 100644
--- a/drivers/media/video/m52790.c
+++ b/drivers/media/video/m52790.c
@@ -171,4 +171,3 @@ static struct v4l2_i2c_driver_data v4l2_i2c_data = {
171 .remove = m52790_remove, 171 .remove = m52790_remove,
172 .id_table = m52790_id, 172 .id_table = m52790_id,
173}; 173};
174
diff --git a/drivers/media/video/msp3400-driver.c b/drivers/media/video/msp3400-driver.c
index 310dbaba55ff..5691e019d195 100644
--- a/drivers/media/video/msp3400-driver.c
+++ b/drivers/media/video/msp3400-driver.c
@@ -110,6 +110,7 @@ MODULE_PARM_DESC(dolby, "Activates Dolby processsing");
110 110
111/* Addresses to scan */ 111/* Addresses to scan */
112static unsigned short normal_i2c[] = { 0x80 >> 1, 0x88 >> 1, I2C_CLIENT_END }; 112static unsigned short normal_i2c[] = { 0x80 >> 1, 0x88 >> 1, I2C_CLIENT_END };
113
113I2C_CLIENT_INSMOD; 114I2C_CLIENT_INSMOD;
114 115
115/* ----------------------------------------------------------------------- */ 116/* ----------------------------------------------------------------------- */
@@ -333,7 +334,6 @@ void msp_set_audio(struct i2c_client *client)
333 334
334/* ------------------------------------------------------------------------ */ 335/* ------------------------------------------------------------------------ */
335 336
336
337static void msp_wake_thread(struct i2c_client *client) 337static void msp_wake_thread(struct i2c_client *client)
338{ 338{
339 struct msp_state *state = i2c_get_clientdata(client); 339 struct msp_state *state = i2c_get_clientdata(client);
@@ -1004,7 +1004,6 @@ static struct v4l2_i2c_driver_data v4l2_i2c_data = {
1004 .id_table = msp_id, 1004 .id_table = msp_id,
1005}; 1005};
1006 1006
1007
1008/* 1007/*
1009 * Overrides for Emacs so that we follow Linus's tabbing style. 1008 * Overrides for Emacs so that we follow Linus's tabbing style.
1010 * --------------------------------------------------------------------------- 1009 * ---------------------------------------------------------------------------
diff --git a/drivers/media/video/msp3400-kthreads.c b/drivers/media/video/msp3400-kthreads.c
index 7f5568592793..1622f70e4dd0 100644
--- a/drivers/media/video/msp3400-kthreads.c
+++ b/drivers/media/video/msp3400-kthreads.c
@@ -480,7 +480,6 @@ int msp3400c_thread(void *data)
480 struct msp3400c_carrier_detect *cd; 480 struct msp3400c_carrier_detect *cd;
481 int count, max1, max2, val1, val2, val, i; 481 int count, max1, max2, val1, val2, val, i;
482 482
483
484 v4l_dbg(1, msp_debug, client, "msp3400 daemon started\n"); 483 v4l_dbg(1, msp_debug, client, "msp3400 daemon started\n");
485 set_freezable(); 484 set_freezable();
486 for (;;) { 485 for (;;) {
diff --git a/drivers/media/video/pwc/pwc-ctrl.c b/drivers/media/video/pwc/pwc-ctrl.c
index ea53316d2111..1cccd5c77048 100644
--- a/drivers/media/video/pwc/pwc-ctrl.c
+++ b/drivers/media/video/pwc/pwc-ctrl.c
@@ -1255,7 +1255,6 @@ int pwc_get_cmos_sensor(struct pwc_device *pdev, int *sensor)
1255 exactly the same otherwise. 1255 exactly the same otherwise.
1256 */ 1256 */
1257 1257
1258
1259/* define local variable for arg */ 1258/* define local variable for arg */
1260#define ARG_DEF(ARG_type, ARG_name)\ 1259#define ARG_DEF(ARG_type, ARG_name)\
1261 ARG_type *ARG_name = arg; 1260 ARG_type *ARG_name = arg;
@@ -1268,7 +1267,6 @@ int pwc_get_cmos_sensor(struct pwc_device *pdev, int *sensor)
1268/* copy local variable to arg */ 1267/* copy local variable to arg */
1269#define ARG_OUT(ARG_name) /* nothing */ 1268#define ARG_OUT(ARG_name) /* nothing */
1270 1269
1271
1272int pwc_ioctl(struct pwc_device *pdev, unsigned int cmd, void *arg) 1270int pwc_ioctl(struct pwc_device *pdev, unsigned int cmd, void *arg)
1273{ 1271{
1274 int ret = 0; 1272 int ret = 0;
diff --git a/drivers/media/video/pwc/pwc-ioctl.h b/drivers/media/video/pwc/pwc-ioctl.h
index cec660299768..8c0cae7b3daf 100644
--- a/drivers/media/video/pwc/pwc-ioctl.h
+++ b/drivers/media/video/pwc/pwc-ioctl.h
@@ -54,7 +54,6 @@
54#include <linux/types.h> 54#include <linux/types.h>
55#include <linux/version.h> 55#include <linux/version.h>
56 56
57
58 /* Enumeration of image sizes */ 57 /* Enumeration of image sizes */
59#define PSZ_SQCIF 0x00 58#define PSZ_SQCIF 0x00
60#define PSZ_QSIF 0x01 59#define PSZ_QSIF 0x01
diff --git a/drivers/media/video/saa5246a.c b/drivers/media/video/saa5246a.c
index 996b49491f5a..03e772130b55 100644
--- a/drivers/media/video/saa5246a.c
+++ b/drivers/media/video/saa5246a.c
@@ -66,6 +66,7 @@ static struct video_device saa_template; /* Declared near bottom */
66 66
67/* Addresses to scan */ 67/* Addresses to scan */
68static unsigned short normal_i2c[] = { I2C_ADDRESS, I2C_CLIENT_END }; 68static unsigned short normal_i2c[] = { I2C_ADDRESS, I2C_CLIENT_END };
69
69I2C_CLIENT_INSMOD; 70I2C_CLIENT_INSMOD;
70 71
71static struct i2c_client client_template; 72static struct i2c_client client_template;
diff --git a/drivers/media/video/saa5249.c b/drivers/media/video/saa5249.c
index ec8c65dc8408..fde99d9ee71f 100644
--- a/drivers/media/video/saa5249.c
+++ b/drivers/media/video/saa5249.c
@@ -130,6 +130,7 @@ static struct video_device saa_template; /* Declared near bottom */
130 130
131/* Addresses to scan */ 131/* Addresses to scan */
132static unsigned short normal_i2c[] = {34>>1,I2C_CLIENT_END}; 132static unsigned short normal_i2c[] = {34>>1,I2C_CLIENT_END};
133
133I2C_CLIENT_INSMOD; 134I2C_CLIENT_INSMOD;
134 135
135static struct i2c_client client_template; 136static struct i2c_client client_template;
diff --git a/drivers/media/video/saa6588.c b/drivers/media/video/saa6588.c
index 716ee7f64df3..f05024259f01 100644
--- a/drivers/media/video/saa6588.c
+++ b/drivers/media/video/saa6588.c
@@ -31,7 +31,6 @@
31#include <linux/wait.h> 31#include <linux/wait.h>
32#include <asm/uaccess.h> 32#include <asm/uaccess.h>
33 33
34
35#include <media/rds.h> 34#include <media/rds.h>
36 35
37/* Addresses to scan */ 36/* Addresses to scan */
diff --git a/drivers/media/video/saa7115.c b/drivers/media/video/saa7115.c
index 435c083cc542..f0baca71dd3e 100644
--- a/drivers/media/video/saa7115.c
+++ b/drivers/media/video/saa7115.c
@@ -67,7 +67,6 @@ static unsigned short normal_i2c[] = {
67 0x42 >> 1, 0x40 >> 1, /* SAA7114, SAA7115 and SAA7118 */ 67 0x42 >> 1, 0x40 >> 1, /* SAA7114, SAA7115 and SAA7118 */
68 I2C_CLIENT_END }; 68 I2C_CLIENT_END };
69 69
70
71I2C_CLIENT_INSMOD; 70I2C_CLIENT_INSMOD;
72 71
73struct saa711x_state { 72struct saa711x_state {
@@ -1577,4 +1576,3 @@ static struct v4l2_i2c_driver_data v4l2_i2c_data = {
1577 .legacy_class = I2C_CLASS_TV_ANALOG | I2C_CLASS_TV_DIGITAL, 1576 .legacy_class = I2C_CLASS_TV_ANALOG | I2C_CLASS_TV_DIGITAL,
1578 .id_table = saa7115_id, 1577 .id_table = saa7115_id,
1579}; 1578};
1580
diff --git a/drivers/media/video/saa7127.c b/drivers/media/video/saa7127.c
index 79d11a658bdf..7ba10e56c609 100644
--- a/drivers/media/video/saa7127.c
+++ b/drivers/media/video/saa7127.c
@@ -753,4 +753,3 @@ static struct v4l2_i2c_driver_data v4l2_i2c_data = {
753 .remove = saa7127_remove, 753 .remove = saa7127_remove,
754 .id_table = saa7127_id, 754 .id_table = saa7127_id,
755}; 755};
756
diff --git a/drivers/media/video/saa7134/saa6752hs.c b/drivers/media/video/saa7134/saa6752hs.c
index fc32c3f68af1..707be175509d 100644
--- a/drivers/media/video/saa7134/saa6752hs.c
+++ b/drivers/media/video/saa7134/saa6752hs.c
@@ -13,7 +13,6 @@
13#include <linux/init.h> 13#include <linux/init.h>
14#include <linux/crc32.h> 14#include <linux/crc32.h>
15 15
16
17#define MPEG_VIDEO_TARGET_BITRATE_MAX 27000 16#define MPEG_VIDEO_TARGET_BITRATE_MAX 27000
18#define MPEG_VIDEO_MAX_BITRATE_MAX 27000 17#define MPEG_VIDEO_MAX_BITRATE_MAX 27000
19#define MPEG_TOTAL_TARGET_BITRATE_MAX 27000 18#define MPEG_TOTAL_TARGET_BITRATE_MAX 27000
@@ -21,6 +20,7 @@
21 20
22/* Addresses to scan */ 21/* Addresses to scan */
23static unsigned short normal_i2c[] = {0x20, I2C_CLIENT_END}; 22static unsigned short normal_i2c[] = {0x20, I2C_CLIENT_END};
23
24I2C_CLIENT_INSMOD; 24I2C_CLIENT_INSMOD;
25 25
26MODULE_DESCRIPTION("device driver for saa6752hs MPEG2 encoder"); 26MODULE_DESCRIPTION("device driver for saa6752hs MPEG2 encoder");
@@ -707,7 +707,6 @@ static int saa6752hs_attach(struct i2c_adapter *adap, int addr, int kind)
707 i2c_attach_client(&h->client); 707 i2c_attach_client(&h->client);
708 708
709 v4l_info(&h->client,"saa6752hs: chip found @ 0x%x\n", addr<<1); 709 v4l_info(&h->client,"saa6752hs: chip found @ 0x%x\n", addr<<1);
710
711 return 0; 710 return 0;
712} 711}
713 712
diff --git a/drivers/media/video/saa7134/saa7134-alsa.c b/drivers/media/video/saa7134/saa7134-alsa.c
index f118de6e3672..9929d20320b4 100644
--- a/drivers/media/video/saa7134/saa7134-alsa.c
+++ b/drivers/media/video/saa7134/saa7134-alsa.c
@@ -80,7 +80,6 @@ typedef struct snd_card_saa7134 {
80} snd_card_saa7134_t; 80} snd_card_saa7134_t;
81 81
82 82
83
84/* 83/*
85 * PCM structure 84 * PCM structure
86 */ 85 */
@@ -1121,6 +1120,3 @@ late_initcall(saa7134_alsa_init);
1121module_exit(saa7134_alsa_exit); 1120module_exit(saa7134_alsa_exit);
1122MODULE_LICENSE("GPL"); 1121MODULE_LICENSE("GPL");
1123MODULE_AUTHOR("Ricardo Cerqueira"); 1122MODULE_AUTHOR("Ricardo Cerqueira");
1124
1125
1126
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index 932a93cab3ef..2511d0679c58 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -4220,6 +4220,7 @@ struct saa7134_board saa7134_boards[] = {
4220 .radio_type = UNSET, 4220 .radio_type = UNSET,
4221 .tuner_addr = ADDR_UNSET, 4221 .tuner_addr = ADDR_UNSET,
4222 .radio_addr = ADDR_UNSET, 4222 .radio_addr = ADDR_UNSET,
4223 .mpeg = SAA7134_MPEG_DVB,
4223 .inputs = {{ 4224 .inputs = {{
4224 .name = name_tv, 4225 .name = name_tv,
4225 .vmux = 1, 4226 .vmux = 1,
@@ -4246,7 +4247,6 @@ struct saa7134_board saa7134_boards[] = {
4246 .radio_type = UNSET, 4247 .radio_type = UNSET,
4247 .tuner_addr = ADDR_UNSET, 4248 .tuner_addr = ADDR_UNSET,
4248 .radio_addr = ADDR_UNSET, 4249 .radio_addr = ADDR_UNSET,
4249 .mpeg = SAA7134_MPEG_DVB,
4250 .inputs = {{ 4250 .inputs = {{
4251 .name = name_tv, 4251 .name = name_tv,
4252 .vmux = 1, 4252 .vmux = 1,
diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c
index 2c19cd0113c8..cfee84ee7a88 100644
--- a/drivers/media/video/saa7134/saa7134-core.c
+++ b/drivers/media/video/saa7134/saa7134-core.c
@@ -150,7 +150,6 @@ void saa7134_set_gpio(struct saa7134_dev *dev, int bit_no, int value)
150 150
151#if defined(CONFIG_MODULES) && defined(MODULE) 151#if defined(CONFIG_MODULES) && defined(MODULE)
152 152
153
154static void request_module_async(struct work_struct *work){ 153static void request_module_async(struct work_struct *work){
155 struct saa7134_dev* dev = container_of(work, struct saa7134_dev, request_module_wk); 154 struct saa7134_dev* dev = container_of(work, struct saa7134_dev, request_module_wk);
156 if (card_is_empress(dev)) 155 if (card_is_empress(dev))
diff --git a/drivers/media/video/saa7134/saa7134-tvaudio.c b/drivers/media/video/saa7134/saa7134-tvaudio.c
index 4cc3741c5472..c5d0b44c179e 100644
--- a/drivers/media/video/saa7134/saa7134-tvaudio.c
+++ b/drivers/media/video/saa7134/saa7134-tvaudio.c
@@ -477,7 +477,6 @@ static int tvaudio_thread(void *data)
477 unsigned int i, audio, nscan; 477 unsigned int i, audio, nscan;
478 int max1,max2,carrier,rx,mode,lastmode,default_carrier; 478 int max1,max2,carrier,rx,mode,lastmode,default_carrier;
479 479
480
481 set_freezable(); 480 set_freezable();
482 481
483 for (;;) { 482 for (;;) {
@@ -775,7 +774,6 @@ static int tvaudio_thread_ddep(void *data)
775 struct saa7134_dev *dev = data; 774 struct saa7134_dev *dev = data;
776 u32 value, norms; 775 u32 value, norms;
777 776
778
779 set_freezable(); 777 set_freezable();
780 for (;;) { 778 for (;;) {
781 tvaudio_sleep(dev,-1); 779 tvaudio_sleep(dev,-1);
diff --git a/drivers/media/video/tda7432.c b/drivers/media/video/tda7432.c
index b4d10f7a4e57..ae75c187da79 100644
--- a/drivers/media/video/tda7432.c
+++ b/drivers/media/video/tda7432.c
@@ -72,6 +72,7 @@ static unsigned short normal_i2c[] = {
72 I2C_ADDR_TDA7432 >> 1, 72 I2C_ADDR_TDA7432 >> 1,
73 I2C_CLIENT_END, 73 I2C_CLIENT_END,
74}; 74};
75
75I2C_CLIENT_INSMOD; 76I2C_CLIENT_INSMOD;
76 77
77/* Structure of address and subaddresses for the tda7432 */ 78/* Structure of address and subaddresses for the tda7432 */
diff --git a/drivers/media/video/tda9840.c b/drivers/media/video/tda9840.c
index 0cee00242782..2437c1a269c5 100644
--- a/drivers/media/video/tda9840.c
+++ b/drivers/media/video/tda9840.c
@@ -34,6 +34,7 @@
34static int debug; /* insmod parameter */ 34static int debug; /* insmod parameter */
35module_param(debug, int, 0644); 35module_param(debug, int, 0644);
36MODULE_PARM_DESC(debug, "Turn on/off device debugging (default:off)."); 36MODULE_PARM_DESC(debug, "Turn on/off device debugging (default:off).");
37
37#define dprintk(args...) \ 38#define dprintk(args...) \
38 do { if (debug) { printk("%s: %s()[%d]: ", KBUILD_MODNAME, __func__, __LINE__); printk(args); } } while (0) 39 do { if (debug) { printk("%s: %s()[%d]: ", KBUILD_MODNAME, __func__, __LINE__); printk(args); } } while (0)
39 40
diff --git a/drivers/media/video/tda9875.c b/drivers/media/video/tda9875.c
index 3c0557130a70..7a8ce8fb46dc 100644
--- a/drivers/media/video/tda9875.c
+++ b/drivers/media/video/tda9875.c
@@ -30,7 +30,6 @@
30#include <linux/i2c.h> 30#include <linux/i2c.h>
31#include <linux/init.h> 31#include <linux/init.h>
32 32
33
34#include <media/i2c-addr.h> 33#include <media/i2c-addr.h>
35 34
36static int debug; /* insmod parameter */ 35static int debug; /* insmod parameter */
@@ -42,6 +41,7 @@ static unsigned short normal_i2c[] = {
42 I2C_ADDR_TDA9875 >> 1, 41 I2C_ADDR_TDA9875 >> 1,
43 I2C_CLIENT_END 42 I2C_CLIENT_END
44}; 43};
44
45I2C_CLIENT_INSMOD; 45I2C_CLIENT_INSMOD;
46 46
47/* This is a superset of the TDA9875 */ 47/* This is a superset of the TDA9875 */
diff --git a/drivers/media/video/tea6415c.c b/drivers/media/video/tea6415c.c
index 9513d8611e87..421c1445e96c 100644
--- a/drivers/media/video/tea6415c.c
+++ b/drivers/media/video/tea6415c.c
@@ -36,6 +36,7 @@
36static int debug; /* insmod parameter */ 36static int debug; /* insmod parameter */
37module_param(debug, int, 0644); 37module_param(debug, int, 0644);
38MODULE_PARM_DESC(debug, "Turn on/off device debugging (default:off)."); 38MODULE_PARM_DESC(debug, "Turn on/off device debugging (default:off).");
39
39#define dprintk(args...) \ 40#define dprintk(args...) \
40 do { if (debug) { printk("%s: %s()[%d]: ", KBUILD_MODNAME, __func__, __LINE__); printk(args); } } while (0) 41 do { if (debug) { printk("%s: %s()[%d]: ", KBUILD_MODNAME, __func__, __LINE__); printk(args); } } while (0)
41 42
diff --git a/drivers/media/video/tea6420.c b/drivers/media/video/tea6420.c
index 7fd53367c07c..b5c8957d130e 100644
--- a/drivers/media/video/tea6420.c
+++ b/drivers/media/video/tea6420.c
@@ -36,6 +36,7 @@
36static int debug; /* insmod parameter */ 36static int debug; /* insmod parameter */
37module_param(debug, int, 0644); 37module_param(debug, int, 0644);
38MODULE_PARM_DESC(debug, "Turn on/off device debugging (default:off)."); 38MODULE_PARM_DESC(debug, "Turn on/off device debugging (default:off).");
39
39#define dprintk(args...) \ 40#define dprintk(args...) \
40 do { if (debug) { printk("%s: %s()[%d]: ", KBUILD_MODNAME, __func__, __LINE__); printk(args); } } while (0) 41 do { if (debug) { printk("%s: %s()[%d]: ", KBUILD_MODNAME, __func__, __LINE__); printk(args); } } while (0)
41 42
diff --git a/drivers/media/video/tlv320aic23b.c b/drivers/media/video/tlv320aic23b.c
index 28ab9f9d760a..9220378a5637 100644
--- a/drivers/media/video/tlv320aic23b.c
+++ b/drivers/media/video/tlv320aic23b.c
@@ -39,7 +39,6 @@ MODULE_LICENSE("GPL");
39 39
40static unsigned short normal_i2c[] = { 0x34 >> 1, I2C_CLIENT_END }; 40static unsigned short normal_i2c[] = { 0x34 >> 1, I2C_CLIENT_END };
41 41
42
43I2C_CLIENT_INSMOD; 42I2C_CLIENT_INSMOD;
44 43
45/* ----------------------------------------------------------------------- */ 44/* ----------------------------------------------------------------------- */
diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c
index 0d12ace61665..93d879dc510f 100644
--- a/drivers/media/video/tuner-core.c
+++ b/drivers/media/video/tuner-core.c
@@ -1298,7 +1298,6 @@ static struct v4l2_i2c_driver_data v4l2_i2c_data = {
1298 .id_table = tuner_id, 1298 .id_table = tuner_id,
1299}; 1299};
1300 1300
1301
1302/* 1301/*
1303 * Overrides for Emacs so that we follow Linus's tabbing style. 1302 * Overrides for Emacs so that we follow Linus's tabbing style.
1304 * --------------------------------------------------------------------------- 1303 * ---------------------------------------------------------------------------
diff --git a/drivers/media/video/usbvision/usbvision-core.c b/drivers/media/video/usbvision/usbvision-core.c
index a9c5e5adba3a..abf685464b7c 100644
--- a/drivers/media/video/usbvision/usbvision-core.c
+++ b/drivers/media/video/usbvision/usbvision-core.c
@@ -169,7 +169,6 @@ static void usbvision_rvfree(void *mem, unsigned long size)
169} 169}
170 170
171 171
172
173#if ENABLE_HEXDUMP 172#if ENABLE_HEXDUMP
174static void usbvision_hexdump(const unsigned char *data, int len) 173static void usbvision_hexdump(const unsigned char *data, int len)
175{ 174{
@@ -2317,7 +2316,6 @@ static void usbvision_powerOffTimer(unsigned long data)
2317 del_timer(&usbvision->powerOffTimer); 2316 del_timer(&usbvision->powerOffTimer);
2318 INIT_WORK(&usbvision->powerOffWork, call_usbvision_power_off); 2317 INIT_WORK(&usbvision->powerOffWork, call_usbvision_power_off);
2319 (void) schedule_work(&usbvision->powerOffWork); 2318 (void) schedule_work(&usbvision->powerOffWork);
2320
2321} 2319}
2322 2320
2323void usbvision_init_powerOffTimer(struct usb_usbvision *usbvision) 2321void usbvision_init_powerOffTimer(struct usb_usbvision *usbvision)
@@ -2518,7 +2516,6 @@ int usbvision_init_isoc(struct usb_usbvision *usbvision)
2518 } 2516 }
2519 } 2517 }
2520 2518
2521
2522 /* Submit all URBs */ 2519 /* Submit all URBs */
2523 for (bufIdx = 0; bufIdx < USBVISION_NUMSBUF; bufIdx++) { 2520 for (bufIdx = 0; bufIdx < USBVISION_NUMSBUF; bufIdx++) {
2524 errCode = usb_submit_urb(usbvision->sbuf[bufIdx].urb, 2521 errCode = usb_submit_urb(usbvision->sbuf[bufIdx].urb,
@@ -2564,7 +2561,6 @@ void usbvision_stop_isoc(struct usb_usbvision *usbvision)
2564 usbvision->sbuf[bufIdx].urb = NULL; 2561 usbvision->sbuf[bufIdx].urb = NULL;
2565 } 2562 }
2566 2563
2567
2568 PDEBUG(DBG_ISOC, "%s: streaming=Stream_Off\n", __func__); 2564 PDEBUG(DBG_ISOC, "%s: streaming=Stream_Off\n", __func__);
2569 usbvision->streaming = Stream_Off; 2565 usbvision->streaming = Stream_Off;
2570 2566
diff --git a/drivers/media/video/usbvision/usbvision-i2c.c b/drivers/media/video/usbvision/usbvision-i2c.c
index e2274d77ea29..a6d00858b07e 100644
--- a/drivers/media/video/usbvision/usbvision-i2c.c
+++ b/drivers/media/video/usbvision/usbvision-i2c.c
@@ -190,7 +190,6 @@ static u32 functionality(struct i2c_adapter *adap)
190 return I2C_FUNC_SMBUS_EMUL | I2C_FUNC_10BIT_ADDR; 190 return I2C_FUNC_SMBUS_EMUL | I2C_FUNC_10BIT_ADDR;
191} 191}
192 192
193
194/* -----exported algorithm data: ------------------------------------- */ 193/* -----exported algorithm data: ------------------------------------- */
195 194
196static struct i2c_algorithm usbvision_algo = { 195static struct i2c_algorithm usbvision_algo = {
@@ -514,11 +513,7 @@ static struct i2c_adapter i2c_adap_template = {
514 .id = I2C_HW_B_BT848, /* FIXME */ 513 .id = I2C_HW_B_BT848, /* FIXME */
515 .client_register = attach_inform, 514 .client_register = attach_inform,
516 .client_unregister = detach_inform, 515 .client_unregister = detach_inform,
517#ifdef I2C_ADAP_CLASS_TV_ANALOG
518 .class = I2C_ADAP_CLASS_TV_ANALOG,
519#else
520 .class = I2C_CLASS_TV_ANALOG, 516 .class = I2C_CLASS_TV_ANALOG,
521#endif
522}; 517};
523 518
524static struct i2c_client i2c_client_template = { 519static struct i2c_client i2c_client_template = {
diff --git a/drivers/media/video/usbvision/usbvision-video.c b/drivers/media/video/usbvision/usbvision-video.c
index a9e5e08caec5..cd6c41d67899 100644
--- a/drivers/media/video/usbvision/usbvision-video.c
+++ b/drivers/media/video/usbvision/usbvision-video.c
@@ -179,7 +179,6 @@ MODULE_ALIAS(DRIVER_ALIAS);
179/* /sys/bus/usb/drivers/USBVision Video Grabber */ 179/* /sys/bus/usb/drivers/USBVision Video Grabber */
180/*****************************************************************************/ 180/*****************************************************************************/
181 181
182
183#define YES_NO(x) ((x) ? "Yes" : "No") 182#define YES_NO(x) ((x) ? "Yes" : "No")
184 183
185static inline struct usb_usbvision *cd_to_usbvision(struct device *cd) 184static inline struct usb_usbvision *cd_to_usbvision(struct device *cd)
@@ -370,7 +369,6 @@ static void usbvision_remove_sysfs(struct video_device *vdev)
370 } 369 }
371} 370}
372 371
373
374/* 372/*
375 * usbvision_open() 373 * usbvision_open()
376 * 374 *
@@ -388,7 +386,6 @@ static int usbvision_v4l2_open(struct inode *inode, struct file *file)
388 386
389 PDEBUG(DBG_IO, "open"); 387 PDEBUG(DBG_IO, "open");
390 388
391
392 usbvision_reset_powerOffTimer(usbvision); 389 usbvision_reset_powerOffTimer(usbvision);
393 390
394 if (usbvision->user) 391 if (usbvision->user)
@@ -442,9 +439,6 @@ static int usbvision_v4l2_open(struct inode *inode, struct file *file)
442 mutex_unlock(&usbvision->lock); 439 mutex_unlock(&usbvision->lock);
443 } 440 }
444 441
445 if (errCode) {
446 }
447
448 /* prepare queues */ 442 /* prepare queues */
449 usbvision_empty_framequeues(usbvision); 443 usbvision_empty_framequeues(usbvision);
450 444
@@ -495,8 +489,6 @@ static int usbvision_v4l2_close(struct inode *inode, struct file *file)
495 } 489 }
496 490
497 PDEBUG(DBG_IO, "success"); 491 PDEBUG(DBG_IO, "success");
498
499
500 return 0; 492 return 0;
501} 493}
502 494
@@ -1346,9 +1338,7 @@ static int usbvision_radio_close(struct inode *inode, struct file *file)
1346 usbvision_release(usbvision); 1338 usbvision_release(usbvision);
1347 } 1339 }
1348 1340
1349
1350 PDEBUG(DBG_IO, "success"); 1341 PDEBUG(DBG_IO, "success");
1351
1352 return errCode; 1342 return errCode;
1353} 1343}
1354 1344
@@ -1360,7 +1350,6 @@ static int usbvision_vbi_open(struct inode *inode, struct file *file)
1360{ 1350{
1361 /* TODO */ 1351 /* TODO */
1362 return -ENODEV; 1352 return -ENODEV;
1363
1364} 1353}
1365 1354
1366static int usbvision_vbi_close(struct inode *inode, struct file *file) 1355static int usbvision_vbi_close(struct inode *inode, struct file *file)
@@ -1899,7 +1888,6 @@ static void __devexit usbvision_disconnect(struct usb_interface *intf)
1899 } 1888 }
1900 1889
1901 PDEBUG(DBG_PROBE, "success"); 1890 PDEBUG(DBG_PROBE, "success");
1902
1903} 1891}
1904 1892
1905static struct usb_driver usbvision_driver = { 1893static struct usb_driver usbvision_driver = {
diff --git a/drivers/media/video/uvc/uvc_ctrl.c b/drivers/media/video/uvc/uvc_ctrl.c
index f0ee46d15540..3ae95512666f 100644
--- a/drivers/media/video/uvc/uvc_ctrl.c
+++ b/drivers/media/video/uvc/uvc_ctrl.c
@@ -1254,3 +1254,4 @@ void uvc_ctrl_init(void)
1254 for (; mapping < mend; ++mapping) 1254 for (; mapping < mend; ++mapping)
1255 uvc_ctrl_add_mapping(mapping); 1255 uvc_ctrl_add_mapping(mapping);
1256} 1256}
1257
diff --git a/drivers/media/video/uvc/uvc_driver.c b/drivers/media/video/uvc/uvc_driver.c
index 86bb16d00173..31a0e706a7f6 100644
--- a/drivers/media/video/uvc/uvc_driver.c
+++ b/drivers/media/video/uvc/uvc_driver.c
@@ -1954,3 +1954,4 @@ MODULE_AUTHOR(DRIVER_AUTHOR);
1954MODULE_DESCRIPTION(DRIVER_DESC); 1954MODULE_DESCRIPTION(DRIVER_DESC);
1955MODULE_LICENSE("GPL"); 1955MODULE_LICENSE("GPL");
1956MODULE_VERSION(DRIVER_VERSION); 1956MODULE_VERSION(DRIVER_VERSION);
1957
diff --git a/drivers/media/video/uvc/uvc_queue.c b/drivers/media/video/uvc/uvc_queue.c
index 0923f0e3b3d4..7388d0cee3d4 100644
--- a/drivers/media/video/uvc/uvc_queue.c
+++ b/drivers/media/video/uvc/uvc_queue.c
@@ -475,3 +475,4 @@ struct uvc_buffer *uvc_queue_next_buffer(struct uvc_video_queue *queue,
475 wake_up(&buf->wait); 475 wake_up(&buf->wait);
476 return nextbuf; 476 return nextbuf;
477} 477}
478
diff --git a/drivers/media/video/uvc/uvc_status.c b/drivers/media/video/uvc/uvc_status.c
index 06b47980ed98..7bfddad37d8c 100644
--- a/drivers/media/video/uvc/uvc_status.c
+++ b/drivers/media/video/uvc/uvc_status.c
@@ -205,3 +205,4 @@ int uvc_status_resume(struct uvc_device *dev)
205 205
206 return usb_submit_urb(dev->int_urb, GFP_NOIO); 206 return usb_submit_urb(dev->int_urb, GFP_NOIO);
207} 207}
208
diff --git a/drivers/media/video/uvc/uvc_v4l2.c b/drivers/media/video/uvc/uvc_v4l2.c
index 2e0a66575bb4..0456bbdcd695 100644
--- a/drivers/media/video/uvc/uvc_v4l2.c
+++ b/drivers/media/video/uvc/uvc_v4l2.c
@@ -1103,3 +1103,4 @@ struct file_operations uvc_fops = {
1103 .mmap = uvc_v4l2_mmap, 1103 .mmap = uvc_v4l2_mmap,
1104 .poll = uvc_v4l2_poll, 1104 .poll = uvc_v4l2_poll,
1105}; 1105};
1106
diff --git a/drivers/media/video/uvc/uvc_video.c b/drivers/media/video/uvc/uvc_video.c
index 817af2e36362..ad63794fda77 100644
--- a/drivers/media/video/uvc/uvc_video.c
+++ b/drivers/media/video/uvc/uvc_video.c
@@ -964,3 +964,4 @@ int uvc_video_enable(struct uvc_video_device *video, int enable)
964 964
965 return uvc_init_video(video, GFP_KERNEL); 965 return uvc_init_video(video, GFP_KERNEL);
966} 966}
967
diff --git a/drivers/media/video/uvc/uvcvideo.h b/drivers/media/video/uvc/uvcvideo.h
index 2444b8a9d2a0..bafe3406e305 100644
--- a/drivers/media/video/uvc/uvcvideo.h
+++ b/drivers/media/video/uvc/uvcvideo.h
@@ -796,3 +796,4 @@ void uvc_video_decode_isight(struct urb *urb, struct uvc_video_device *video,
796#endif /* __KERNEL__ */ 796#endif /* __KERNEL__ */
797 797
798#endif 798#endif
799
diff --git a/drivers/media/video/videobuf-dvb.c b/drivers/media/video/videobuf-dvb.c
index 6e4d73ec6855..b56cffcbfd45 100644
--- a/drivers/media/video/videobuf-dvb.c
+++ b/drivers/media/video/videobuf-dvb.c
@@ -13,7 +13,6 @@
13 * (at your option) any later version. 13 * (at your option) any later version.
14 */ 14 */
15 15
16
17#include <linux/module.h> 16#include <linux/module.h>
18#include <linux/init.h> 17#include <linux/init.h>
19#include <linux/device.h> 18#include <linux/device.h>
@@ -257,4 +256,3 @@ EXPORT_SYMBOL(videobuf_dvb_unregister);
257 * compile-command: "make DVB=1" 256 * compile-command: "make DVB=1"
258 * End: 257 * End:
259 */ 258 */
260
diff --git a/drivers/media/video/vp27smpx.c b/drivers/media/video/vp27smpx.c
index a1f76ee032e7..cbecb3cbbbaa 100644
--- a/drivers/media/video/vp27smpx.c
+++ b/drivers/media/video/vp27smpx.c
@@ -166,4 +166,3 @@ static struct v4l2_i2c_driver_data v4l2_i2c_data = {
166 .remove = vp27smpx_remove, 166 .remove = vp27smpx_remove,
167 .id_table = vp27smpx_id, 167 .id_table = vp27smpx_id,
168}; 168};
169
diff --git a/drivers/media/video/wm8739.c b/drivers/media/video/wm8739.c
index fc50299caa36..7be47a255853 100644
--- a/drivers/media/video/wm8739.c
+++ b/drivers/media/video/wm8739.c
@@ -327,4 +327,3 @@ static struct v4l2_i2c_driver_data v4l2_i2c_data = {
327 .remove = wm8739_remove, 327 .remove = wm8739_remove,
328 .id_table = wm8739_id, 328 .id_table = wm8739_id,
329}; 329};
330
diff --git a/drivers/media/video/wm8775.c b/drivers/media/video/wm8775.c
index 506378a508b9..c2ab70a04a74 100644
--- a/drivers/media/video/wm8775.c
+++ b/drivers/media/video/wm8775.c
@@ -42,7 +42,6 @@ MODULE_LICENSE("GPL");
42 42
43static unsigned short normal_i2c[] = { 0x36 >> 1, I2C_CLIENT_END }; 43static unsigned short normal_i2c[] = { 0x36 >> 1, I2C_CLIENT_END };
44 44
45
46I2C_CLIENT_INSMOD; 45I2C_CLIENT_INSMOD;
47 46
48 47
@@ -230,4 +229,3 @@ static struct v4l2_i2c_driver_data v4l2_i2c_data = {
230 .remove = wm8775_remove, 229 .remove = wm8775_remove,
231 .id_table = wm8775_id, 230 .id_table = wm8775_id,
232}; 231};
233