aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/video/adv7170.c6
-rw-r--r--drivers/media/video/adv7175.c6
-rw-r--r--drivers/media/video/bt819.c6
-rw-r--r--drivers/media/video/bt832.c6
-rw-r--r--drivers/media/video/bt856.c6
-rw-r--r--drivers/media/video/bttv-i2c.c2
-rw-r--r--drivers/media/video/cs53l32a.c13
-rw-r--r--drivers/media/video/cx25840/cx25840-core.c6
-rw-r--r--drivers/media/video/cx25840/cx25840.h7
-rw-r--r--drivers/media/video/cx88/cx88-i2c.c2
-rw-r--r--drivers/media/video/indycam.c6
-rw-r--r--drivers/media/video/ir-kbd-i2c.c5
-rw-r--r--drivers/media/video/msp3400.c19
-rw-r--r--drivers/media/video/ovcamchip/ovcamchip_core.c6
-rw-r--r--drivers/media/video/saa5246a.c6
-rw-r--r--drivers/media/video/saa5249.c6
-rw-r--r--drivers/media/video/saa6588.c6
-rw-r--r--drivers/media/video/saa7110.c6
-rw-r--r--drivers/media/video/saa7111.c6
-rw-r--r--drivers/media/video/saa7114.c6
-rw-r--r--drivers/media/video/saa7115.c13
-rw-r--r--drivers/media/video/saa711x.c6
-rw-r--r--drivers/media/video/saa7127.c16
-rw-r--r--drivers/media/video/saa7134/saa6752hs.c6
-rw-r--r--drivers/media/video/saa7134/saa7134-i2c.c4
-rw-r--r--drivers/media/video/saa7185.c6
-rw-r--r--drivers/media/video/saa7191.c6
-rw-r--r--drivers/media/video/tda7432.c6
-rw-r--r--drivers/media/video/tda9840.c6
-rw-r--r--drivers/media/video/tda9875.c6
-rw-r--r--drivers/media/video/tda9887.c4
-rw-r--r--drivers/media/video/tea6415c.c6
-rw-r--r--drivers/media/video/tea6420.c6
-rw-r--r--drivers/media/video/tuner-3036.c6
-rw-r--r--drivers/media/video/tuner-core.c6
-rw-r--r--drivers/media/video/tvaudio.c6
-rw-r--r--drivers/media/video/tveeprom.c6
-rw-r--r--drivers/media/video/tvmixer.c8
-rw-r--r--drivers/media/video/tvp5150.c6
-rw-r--r--drivers/media/video/vpx3220.c6
-rw-r--r--drivers/media/video/wm8775.c10
-rw-r--r--drivers/media/video/zoran_driver.c14
-rw-r--r--drivers/usb/media/w9968cf.c4
-rw-r--r--include/media/tuner.h7
44 files changed, 191 insertions, 111 deletions
diff --git a/drivers/media/video/adv7170.c b/drivers/media/video/adv7170.c
index 622b1619a7e3..c5f1c6b681bd 100644
--- a/drivers/media/video/adv7170.c
+++ b/drivers/media/video/adv7170.c
@@ -497,8 +497,10 @@ adv7170_detach_client (struct i2c_client *client)
497/* ----------------------------------------------------------------------- */ 497/* ----------------------------------------------------------------------- */
498 498
499static struct i2c_driver i2c_driver_adv7170 = { 499static struct i2c_driver i2c_driver_adv7170 = {
500 .owner = THIS_MODULE, 500 .driver = {
501 .name = "adv7170", /* name */ 501 .owner = THIS_MODULE,
502 .name = "adv7170", /* name */
503 },
502 504
503 .id = I2C_DRIVERID_ADV7170, 505 .id = I2C_DRIVERID_ADV7170,
504 506
diff --git a/drivers/media/video/adv7175.c b/drivers/media/video/adv7175.c
index d4859b445715..33158aa734d3 100644
--- a/drivers/media/video/adv7175.c
+++ b/drivers/media/video/adv7175.c
@@ -547,8 +547,10 @@ adv7175_detach_client (struct i2c_client *client)
547/* ----------------------------------------------------------------------- */ 547/* ----------------------------------------------------------------------- */
548 548
549static struct i2c_driver i2c_driver_adv7175 = { 549static struct i2c_driver i2c_driver_adv7175 = {
550 .owner = THIS_MODULE, 550 .driver = {
551 .name = "adv7175", /* name */ 551 .owner = THIS_MODULE,
552 .name = "adv7175", /* name */
553 },
552 554
553 .id = I2C_DRIVERID_ADV7175, 555 .id = I2C_DRIVERID_ADV7175,
554 556
diff --git a/drivers/media/video/bt819.c b/drivers/media/video/bt819.c
index 741e59af0991..5868bbb73a09 100644
--- a/drivers/media/video/bt819.c
+++ b/drivers/media/video/bt819.c
@@ -622,8 +622,10 @@ bt819_detach_client (struct i2c_client *client)
622/* ----------------------------------------------------------------------- */ 622/* ----------------------------------------------------------------------- */
623 623
624static struct i2c_driver i2c_driver_bt819 = { 624static struct i2c_driver i2c_driver_bt819 = {
625 .owner = THIS_MODULE, 625 .driver = {
626 .name = "bt819", 626 .owner = THIS_MODULE,
627 .name = "bt819",
628 },
627 629
628 .id = I2C_DRIVERID_BT819, 630 .id = I2C_DRIVERID_BT819,
629 631
diff --git a/drivers/media/video/bt832.c b/drivers/media/video/bt832.c
index 4ed13860b523..347eb711fc06 100644
--- a/drivers/media/video/bt832.c
+++ b/drivers/media/video/bt832.c
@@ -230,8 +230,10 @@ bt832_command(struct i2c_client *client, unsigned int cmd, void *arg)
230/* ----------------------------------------------------------------------- */ 230/* ----------------------------------------------------------------------- */
231 231
232static struct i2c_driver driver = { 232static struct i2c_driver driver = {
233 .owner = THIS_MODULE, 233 .driver = {
234 .name = "i2c bt832 driver", 234 .owner = THIS_MODULE,
235 .name = "i2c bt832 driver",
236 },
235 .id = -1, /* FIXME */ 237 .id = -1, /* FIXME */
236 .attach_adapter = bt832_probe, 238 .attach_adapter = bt832_probe,
237 .detach_client = bt832_detach, 239 .detach_client = bt832_detach,
diff --git a/drivers/media/video/bt856.c b/drivers/media/video/bt856.c
index d4bba8efac69..207525aa156e 100644
--- a/drivers/media/video/bt856.c
+++ b/drivers/media/video/bt856.c
@@ -404,8 +404,10 @@ bt856_detach_client (struct i2c_client *client)
404/* ----------------------------------------------------------------------- */ 404/* ----------------------------------------------------------------------- */
405 405
406static struct i2c_driver i2c_driver_bt856 = { 406static struct i2c_driver i2c_driver_bt856 = {
407 .owner = THIS_MODULE, 407 .driver = {
408 .name = "bt856", 408 .owner = THIS_MODULE,
409 .name = "bt856",
410 },
409 411
410 .id = I2C_DRIVERID_BT856, 412 .id = I2C_DRIVERID_BT856,
411 413
diff --git a/drivers/media/video/bttv-i2c.c b/drivers/media/video/bttv-i2c.c
index 77619eb131f6..d6418c023d39 100644
--- a/drivers/media/video/bttv-i2c.c
+++ b/drivers/media/video/bttv-i2c.c
@@ -300,7 +300,7 @@ static int attach_inform(struct i2c_client *client)
300 300
301 if (bttv_debug) 301 if (bttv_debug)
302 printk(KERN_DEBUG "bttv%d: %s i2c attach [addr=0x%x,client=%s]\n", 302 printk(KERN_DEBUG "bttv%d: %s i2c attach [addr=0x%x,client=%s]\n",
303 btv->c.nr,client->driver->name,client->addr, 303 btv->c.nr, client->driver->driver.name, client->addr,
304 client->name); 304 client->name);
305 if (!client->driver->command) 305 if (!client->driver->command)
306 return 0; 306 return 0;
diff --git a/drivers/media/video/cs53l32a.c b/drivers/media/video/cs53l32a.c
index f442ce3ba74b..60484f936489 100644
--- a/drivers/media/video/cs53l32a.c
+++ b/drivers/media/video/cs53l32a.c
@@ -42,15 +42,16 @@ MODULE_PARM_DESC(debug, "Debugging messages\n\t\t\t0=Off (default), 1=On");
42#define cs53l32a_dbg(fmt, arg...) \ 42#define cs53l32a_dbg(fmt, arg...) \
43 do { \ 43 do { \
44 if (debug) \ 44 if (debug) \
45 printk(KERN_INFO "%s debug %d-%04x: " fmt, client->driver->name, \ 45 printk(KERN_INFO "%s debug %d-%04x: " fmt, \
46 client->driver->driver.name, \
46 i2c_adapter_id(client->adapter), client->addr , ## arg); \ 47 i2c_adapter_id(client->adapter), client->addr , ## arg); \
47 } while (0) 48 } while (0)
48 49
49#define cs53l32a_err(fmt, arg...) do { \ 50#define cs53l32a_err(fmt, arg...) do { \
50 printk(KERN_ERR "%s %d-%04x: " fmt, client->driver->name, \ 51 printk(KERN_ERR "%s %d-%04x: " fmt, client->driver->driver.name, \
51 i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0) 52 i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
52#define cs53l32a_info(fmt, arg...) do { \ 53#define cs53l32a_info(fmt, arg...) do { \
53 printk(KERN_INFO "%s %d-%04x: " fmt, client->driver->name, \ 54 printk(KERN_INFO "%s %d-%04x: " fmt, client->driver->driver.name, \
54 i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0) 55 i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
55 56
56static unsigned short normal_i2c[] = { 0x22 >> 1, I2C_CLIENT_END }; 57static unsigned short normal_i2c[] = { 0x22 >> 1, I2C_CLIENT_END };
@@ -215,12 +216,14 @@ static int cs53l32a_detach(struct i2c_client *client)
215 216
216/* i2c implementation */ 217/* i2c implementation */
217static struct i2c_driver i2c_driver = { 218static struct i2c_driver i2c_driver = {
218 .name = "cs53l32a", 219 .driver = {
220 .owner = THIS_MODULE,
221 .name = "cs53l32a",
222 },
219 .id = I2C_DRIVERID_CS53L32A, 223 .id = I2C_DRIVERID_CS53L32A,
220 .attach_adapter = cs53l32a_probe, 224 .attach_adapter = cs53l32a_probe,
221 .detach_client = cs53l32a_detach, 225 .detach_client = cs53l32a_detach,
222 .command = cs53l32a_command, 226 .command = cs53l32a_command,
223 .owner = THIS_MODULE,
224}; 227};
225 228
226 229
diff --git a/drivers/media/video/cx25840/cx25840-core.c b/drivers/media/video/cx25840/cx25840-core.c
index 0b278abe879d..830d5195d1c0 100644
--- a/drivers/media/video/cx25840/cx25840-core.c
+++ b/drivers/media/video/cx25840/cx25840-core.c
@@ -843,14 +843,16 @@ static int cx25840_detach_client(struct i2c_client *client)
843/* ----------------------------------------------------------------------- */ 843/* ----------------------------------------------------------------------- */
844 844
845static struct i2c_driver i2c_driver_cx25840 = { 845static struct i2c_driver i2c_driver_cx25840 = {
846 .name = "cx25840", 846 .driver = {
847 .owner = THIS_MODULE,
848 .name = "cx25840",
849 },
847 850
848 .id = I2C_DRIVERID_CX25840, 851 .id = I2C_DRIVERID_CX25840,
849 852
850 .attach_adapter = cx25840_attach_adapter, 853 .attach_adapter = cx25840_attach_adapter,
851 .detach_client = cx25840_detach_client, 854 .detach_client = cx25840_detach_client,
852 .command = cx25840_command, 855 .command = cx25840_command,
853 .owner = THIS_MODULE,
854}; 856};
855 857
856 858
diff --git a/drivers/media/video/cx25840/cx25840.h b/drivers/media/video/cx25840/cx25840.h
index 4932ed1c9b19..40aa59f9c525 100644
--- a/drivers/media/video/cx25840/cx25840.h
+++ b/drivers/media/video/cx25840/cx25840.h
@@ -27,15 +27,16 @@
27extern int cx25840_debug; 27extern int cx25840_debug;
28 28
29#define cx25840_dbg(fmt, arg...) do { if (cx25840_debug) \ 29#define cx25840_dbg(fmt, arg...) do { if (cx25840_debug) \
30 printk(KERN_INFO "%s debug %d-%04x: " fmt, client->driver->name, \ 30 printk(KERN_INFO "%s debug %d-%04x: " fmt, \
31 client->driver->driver.name, \
31 i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0) 32 i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
32 33
33#define cx25840_err(fmt, arg...) do { \ 34#define cx25840_err(fmt, arg...) do { \
34 printk(KERN_ERR "%s %d-%04x: " fmt, client->driver->name, \ 35 printk(KERN_ERR "%s %d-%04x: " fmt, client->driver->driver.name, \
35 i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0) 36 i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
36 37
37#define cx25840_info(fmt, arg...) do { \ 38#define cx25840_info(fmt, arg...) do { \
38 printk(KERN_INFO "%s %d-%04x: " fmt, client->driver->name, \ 39 printk(KERN_INFO "%s %d-%04x: " fmt, client->driver->driver.name, \
39 i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0) 40 i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
40 41
41#define CX25840_CID_CARDTYPE (V4L2_CID_PRIVATE_BASE+0) 42#define CX25840_CID_CARDTYPE (V4L2_CID_PRIVATE_BASE+0)
diff --git a/drivers/media/video/cx88/cx88-i2c.c b/drivers/media/video/cx88/cx88-i2c.c
index 9790d412f192..4a8fb161b16a 100644
--- a/drivers/media/video/cx88/cx88-i2c.c
+++ b/drivers/media/video/cx88/cx88-i2c.c
@@ -94,7 +94,7 @@ static int attach_inform(struct i2c_client *client)
94 struct cx88_core *core = i2c_get_adapdata(client->adapter); 94 struct cx88_core *core = i2c_get_adapdata(client->adapter);
95 95
96 dprintk(1, "%s i2c attach [addr=0x%x,client=%s]\n", 96 dprintk(1, "%s i2c attach [addr=0x%x,client=%s]\n",
97 client->driver->name, client->addr, client->name); 97 client->driver->driver.name, client->addr, client->name);
98 if (!client->driver->command) 98 if (!client->driver->command)
99 return 0; 99 return 0;
100 100
diff --git a/drivers/media/video/indycam.c b/drivers/media/video/indycam.c
index 3eba514cdb29..96a808e8b2ca 100644
--- a/drivers/media/video/indycam.c
+++ b/drivers/media/video/indycam.c
@@ -451,8 +451,10 @@ static int indycam_command(struct i2c_client *client, unsigned int cmd,
451} 451}
452 452
453static struct i2c_driver i2c_driver_indycam = { 453static struct i2c_driver i2c_driver_indycam = {
454 .owner = THIS_MODULE, 454 .driver = {
455 .name = "indycam", 455 .owner = THIS_MODULE,
456 .name = "indycam",
457 },
456 .id = I2C_DRIVERID_INDYCAM, 458 .id = I2C_DRIVERID_INDYCAM,
457 .attach_adapter = indycam_probe, 459 .attach_adapter = indycam_probe,
458 .detach_client = indycam_detach, 460 .detach_client = indycam_detach,
diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c
index 2e2f78a4afc8..82c7f5042659 100644
--- a/drivers/media/video/ir-kbd-i2c.c
+++ b/drivers/media/video/ir-kbd-i2c.c
@@ -278,7 +278,10 @@ static int ir_detach(struct i2c_client *client);
278static int ir_probe(struct i2c_adapter *adap); 278static int ir_probe(struct i2c_adapter *adap);
279 279
280static struct i2c_driver driver = { 280static struct i2c_driver driver = {
281 .name = "ir remote kbd driver", 281 .driver = {
282 .owner = THIS_MODULE,
283 .name = "ir remote kbd driver",
284 },
282 .id = I2C_DRIVERID_INFRARED, 285 .id = I2C_DRIVERID_INFRARED,
283 .attach_adapter = ir_probe, 286 .attach_adapter = ir_probe,
284 .detach_client = ir_detach, 287 .detach_client = ir_detach,
diff --git a/drivers/media/video/msp3400.c b/drivers/media/video/msp3400.c
index c5e8ad3aac4a..3847d890d632 100644
--- a/drivers/media/video/msp3400.c
+++ b/drivers/media/video/msp3400.c
@@ -59,7 +59,8 @@
59#define msp3400_dbg(fmt, arg...) \ 59#define msp3400_dbg(fmt, arg...) \
60 do { \ 60 do { \
61 if (debug) \ 61 if (debug) \
62 printk(KERN_INFO "%s debug %d-%04x: " fmt, client->driver->name, \ 62 printk(KERN_INFO "%s debug %d-%04x: " fmt, \
63 client->driver->driver.name, \
63 i2c_adapter_id(client->adapter), client->addr , ## arg); \ 64 i2c_adapter_id(client->adapter), client->addr , ## arg); \
64 } while (0) 65 } while (0)
65 66
@@ -67,7 +68,8 @@
67#define msp3400_dbg_mediumvol(fmt, arg...) \ 68#define msp3400_dbg_mediumvol(fmt, arg...) \
68 do { \ 69 do { \
69 if (debug >= 2) \ 70 if (debug >= 2) \
70 printk(KERN_INFO "%s debug %d-%04x: " fmt, client->driver->name, \ 71 printk(KERN_INFO "%s debug %d-%04x: " fmt, \
72 client->driver->driver.name, \
71 i2c_adapter_id(client->adapter), client->addr , ## arg); \ 73 i2c_adapter_id(client->adapter), client->addr , ## arg); \
72 } while (0) 74 } while (0)
73 75
@@ -75,18 +77,19 @@
75#define msp3400_dbg_highvol(fmt, arg...) \ 77#define msp3400_dbg_highvol(fmt, arg...) \
76 do { \ 78 do { \
77 if (debug >= 16) \ 79 if (debug >= 16) \
78 printk(KERN_INFO "%s debug %d-%04x: " fmt, client->driver->name, \ 80 printk(KERN_INFO "%s debug %d-%04x: " fmt, \
81 client->driver->driver.name, \
79 i2c_adapter_id(client->adapter), client->addr , ## arg); \ 82 i2c_adapter_id(client->adapter), client->addr , ## arg); \
80 } while (0) 83 } while (0)
81 84
82#define msp3400_err(fmt, arg...) do { \ 85#define msp3400_err(fmt, arg...) do { \
83 printk(KERN_ERR "%s %d-%04x: " fmt, client->driver->name, \ 86 printk(KERN_ERR "%s %d-%04x: " fmt, client->driver->driver.name, \
84 i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0) 87 i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
85#define msp3400_warn(fmt, arg...) do { \ 88#define msp3400_warn(fmt, arg...) do { \
86 printk(KERN_WARNING "%s %d-%04x: " fmt, client->driver->name, \ 89 printk(KERN_WARNING "%s %d-%04x: " fmt, client->driver->driver.name, \
87 i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0) 90 i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
88#define msp3400_info(fmt, arg...) do { \ 91#define msp3400_info(fmt, arg...) do { \
89 printk(KERN_INFO "%s %d-%04x: " fmt, client->driver->name, \ 92 printk(KERN_INFO "%s %d-%04x: " fmt, client->driver->driver.name, \
90 i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0) 93 i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
91 94
92#define OPMODE_AUTO -1 95#define OPMODE_AUTO -1
@@ -1561,13 +1564,13 @@ static int msp_resume(struct device * dev);
1561static void msp_wake_thread(struct i2c_client *client); 1564static void msp_wake_thread(struct i2c_client *client);
1562 1565
1563static struct i2c_driver driver = { 1566static struct i2c_driver driver = {
1564 .owner = THIS_MODULE,
1565 .name = "msp3400",
1566 .id = I2C_DRIVERID_MSP3400, 1567 .id = I2C_DRIVERID_MSP3400,
1567 .attach_adapter = msp_probe, 1568 .attach_adapter = msp_probe,
1568 .detach_client = msp_detach, 1569 .detach_client = msp_detach,
1569 .command = msp_command, 1570 .command = msp_command,
1570 .driver = { 1571 .driver = {
1572 .owner = THIS_MODULE,
1573 .name = "i2c msp3400 driver",
1571 .suspend = msp_suspend, 1574 .suspend = msp_suspend,
1572 .resume = msp_resume, 1575 .resume = msp_resume,
1573 }, 1576 },
diff --git a/drivers/media/video/ovcamchip/ovcamchip_core.c b/drivers/media/video/ovcamchip/ovcamchip_core.c
index 390d0d6c7838..9ac398b2d915 100644
--- a/drivers/media/video/ovcamchip/ovcamchip_core.c
+++ b/drivers/media/video/ovcamchip/ovcamchip_core.c
@@ -410,8 +410,10 @@ static int ovcamchip_command(struct i2c_client *c, unsigned int cmd, void *arg)
410/* ----------------------------------------------------------------------- */ 410/* ----------------------------------------------------------------------- */
411 411
412static struct i2c_driver driver = { 412static struct i2c_driver driver = {
413 .owner = THIS_MODULE, 413 .driver = {
414 .name = "ovcamchip", 414 .owner = THIS_MODULE,
415 .name = "ovcamchip",
416 },
415 .id = I2C_DRIVERID_OVCAMCHIP, 417 .id = I2C_DRIVERID_OVCAMCHIP,
416 .class = I2C_CLASS_CAM_DIGITAL, 418 .class = I2C_CLASS_CAM_DIGITAL,
417 .attach_adapter = ovcamchip_attach, 419 .attach_adapter = ovcamchip_attach,
diff --git a/drivers/media/video/saa5246a.c b/drivers/media/video/saa5246a.c
index 9bf686989aab..8c99edbe1843 100644
--- a/drivers/media/video/saa5246a.c
+++ b/drivers/media/video/saa5246a.c
@@ -163,8 +163,10 @@ static int saa5246a_command(struct i2c_client *device, unsigned int cmd,
163 163
164static struct i2c_driver i2c_driver_videotext = 164static struct i2c_driver i2c_driver_videotext =
165{ 165{
166 .owner = THIS_MODULE, 166 .driver = {
167 .name = IF_NAME, /* name */ 167 .owner = THIS_MODULE,
168 .name = IF_NAME, /* name */
169 },
168 .id = I2C_DRIVERID_SAA5249, /* in i2c.h */ 170 .id = I2C_DRIVERID_SAA5249, /* in i2c.h */
169 .attach_adapter = saa5246a_probe, 171 .attach_adapter = saa5246a_probe,
170 .detach_client = saa5246a_detach, 172 .detach_client = saa5246a_detach,
diff --git a/drivers/media/video/saa5249.c b/drivers/media/video/saa5249.c
index 811e86396030..5b346bdb1d59 100644
--- a/drivers/media/video/saa5249.c
+++ b/drivers/media/video/saa5249.c
@@ -236,8 +236,10 @@ static int saa5249_command(struct i2c_client *device,
236 236
237static struct i2c_driver i2c_driver_videotext = 237static struct i2c_driver i2c_driver_videotext =
238{ 238{
239 .owner = THIS_MODULE, 239 .driver = {
240 .name = IF_NAME, /* name */ 240 .owner = THIS_MODULE,
241 .name = IF_NAME, /* name */
242 },
241 .id = I2C_DRIVERID_SAA5249, /* in i2c.h */ 243 .id = I2C_DRIVERID_SAA5249, /* in i2c.h */
242 .attach_adapter = saa5249_probe, 244 .attach_adapter = saa5249_probe,
243 .detach_client = saa5249_detach, 245 .detach_client = saa5249_detach,
diff --git a/drivers/media/video/saa6588.c b/drivers/media/video/saa6588.c
index 3d4076ca67c3..5ea36ee33b98 100644
--- a/drivers/media/video/saa6588.c
+++ b/drivers/media/video/saa6588.c
@@ -495,8 +495,10 @@ static int saa6588_command(struct i2c_client *client, unsigned int cmd,
495/* ----------------------------------------------------------------------- */ 495/* ----------------------------------------------------------------------- */
496 496
497static struct i2c_driver driver = { 497static struct i2c_driver driver = {
498 .owner = THIS_MODULE, 498 .driver = {
499 .name = "i2c saa6588 driver", 499 .owner = THIS_MODULE,
500 .name = "i2c saa6588 driver",
501 },
500 .id = -1, /* FIXME */ 502 .id = -1, /* FIXME */
501 .attach_adapter = saa6588_probe, 503 .attach_adapter = saa6588_probe,
502 .detach_client = saa6588_detach, 504 .detach_client = saa6588_detach,
diff --git a/drivers/media/video/saa7110.c b/drivers/media/video/saa7110.c
index 8affa63c8b24..58f60baa27e9 100644
--- a/drivers/media/video/saa7110.c
+++ b/drivers/media/video/saa7110.c
@@ -586,8 +586,10 @@ saa7110_detach_client (struct i2c_client *client)
586/* ----------------------------------------------------------------------- */ 586/* ----------------------------------------------------------------------- */
587 587
588static struct i2c_driver i2c_driver_saa7110 = { 588static struct i2c_driver i2c_driver_saa7110 = {
589 .owner = THIS_MODULE, 589 .driver = {
590 .name = "saa7110", 590 .owner = THIS_MODULE,
591 .name = "saa7110",
592 },
591 593
592 .id = I2C_DRIVERID_SAA7110, 594 .id = I2C_DRIVERID_SAA7110,
593 595
diff --git a/drivers/media/video/saa7111.c b/drivers/media/video/saa7111.c
index 2b2204564514..946eb74db374 100644
--- a/drivers/media/video/saa7111.c
+++ b/drivers/media/video/saa7111.c
@@ -589,8 +589,10 @@ saa7111_detach_client (struct i2c_client *client)
589/* ----------------------------------------------------------------------- */ 589/* ----------------------------------------------------------------------- */
590 590
591static struct i2c_driver i2c_driver_saa7111 = { 591static struct i2c_driver i2c_driver_saa7111 = {
592 .owner = THIS_MODULE, 592 .driver = {
593 .name = "saa7111", 593 .owner = THIS_MODULE,
594 .name = "saa7111",
595 },
594 596
595 .id = I2C_DRIVERID_SAA7111A, 597 .id = I2C_DRIVERID_SAA7111A,
596 598
diff --git a/drivers/media/video/saa7114.c b/drivers/media/video/saa7114.c
index 285f6c7a8f71..df53b58a9dbc 100644
--- a/drivers/media/video/saa7114.c
+++ b/drivers/media/video/saa7114.c
@@ -1203,8 +1203,10 @@ saa7114_detach_client (struct i2c_client *client)
1203/* ----------------------------------------------------------------------- */ 1203/* ----------------------------------------------------------------------- */
1204 1204
1205static struct i2c_driver i2c_driver_saa7114 = { 1205static struct i2c_driver i2c_driver_saa7114 = {
1206 .owner = THIS_MODULE, 1206 .driver = {
1207 .name = "saa7114", 1207 .owner = THIS_MODULE,
1208 .name = "saa7114",
1209 },
1208 1210
1209 .id = I2C_DRIVERID_SAA7114, 1211 .id = I2C_DRIVERID_SAA7114,
1210 1212
diff --git a/drivers/media/video/saa7115.c b/drivers/media/video/saa7115.c
index 79aadd2d408f..6ac1ab4c9809 100644
--- a/drivers/media/video/saa7115.c
+++ b/drivers/media/video/saa7115.c
@@ -52,15 +52,16 @@ MODULE_PARM_DESC(debug, "Debug level (0-1)");
52#define saa7115_dbg(fmt,arg...) \ 52#define saa7115_dbg(fmt,arg...) \
53 do { \ 53 do { \
54 if (debug) \ 54 if (debug) \
55 printk(KERN_INFO "%s debug %d-%04x: " fmt, client->driver->name, \ 55 printk(KERN_INFO "%s debug %d-%04x: " fmt, \
56 client->driver->driver.name, \
56 i2c_adapter_id(client->adapter), client->addr , ## arg); \ 57 i2c_adapter_id(client->adapter), client->addr , ## arg); \
57 } while (0) 58 } while (0)
58 59
59#define saa7115_err(fmt, arg...) do { \ 60#define saa7115_err(fmt, arg...) do { \
60 printk(KERN_ERR "%s %d-%04x: " fmt, client->driver->name, \ 61 printk(KERN_ERR "%s %d-%04x: " fmt, client->driver->driver.name, \
61 i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0) 62 i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
62#define saa7115_info(fmt, arg...) do { \ 63#define saa7115_info(fmt, arg...) do { \
63 printk(KERN_INFO "%s %d-%04x: " fmt, client->driver->name, \ 64 printk(KERN_INFO "%s %d-%04x: " fmt, client->driver->driver.name, \
64 i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0) 65 i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
65 66
66static unsigned short normal_i2c[] = { 0x42 >> 1, 0x40 >> 1, I2C_CLIENT_END }; 67static unsigned short normal_i2c[] = { 0x42 >> 1, 0x40 >> 1, I2C_CLIENT_END };
@@ -1353,12 +1354,14 @@ static int saa7115_detach(struct i2c_client *client)
1353 1354
1354/* i2c implementation */ 1355/* i2c implementation */
1355static struct i2c_driver i2c_driver_saa7115 = { 1356static struct i2c_driver i2c_driver_saa7115 = {
1356 .name = "saa7115", 1357 .driver = {
1358 .owner = THIS_MODULE,
1359 .name = "saa7115",
1360 },
1357 .id = I2C_DRIVERID_SAA711X, 1361 .id = I2C_DRIVERID_SAA711X,
1358 .attach_adapter = saa7115_probe, 1362 .attach_adapter = saa7115_probe,
1359 .detach_client = saa7115_detach, 1363 .detach_client = saa7115_detach,
1360 .command = saa7115_command, 1364 .command = saa7115_command,
1361 .owner = THIS_MODULE,
1362}; 1365};
1363 1366
1364 1367
diff --git a/drivers/media/video/saa711x.c b/drivers/media/video/saa711x.c
index 44bfc047704c..3f7cfb7e46eb 100644
--- a/drivers/media/video/saa711x.c
+++ b/drivers/media/video/saa711x.c
@@ -564,8 +564,10 @@ saa711x_detach_client (struct i2c_client *client)
564/* ----------------------------------------------------------------------- */ 564/* ----------------------------------------------------------------------- */
565 565
566static struct i2c_driver i2c_driver_saa711x = { 566static struct i2c_driver i2c_driver_saa711x = {
567 .owner = THIS_MODULE, 567 .driver = {
568 .name = "saa711x", 568 .owner = THIS_MODULE,
569 .name = "saa711x",
570 },
569 571
570 .id = I2C_DRIVERID_SAA711X, 572 .id = I2C_DRIVERID_SAA711X,
571 573
diff --git a/drivers/media/video/saa7127.c b/drivers/media/video/saa7127.c
index 1f4b41599445..659cb8a0b21c 100644
--- a/drivers/media/video/saa7127.c
+++ b/drivers/media/video/saa7127.c
@@ -69,7 +69,8 @@ MODULE_PARM_DESC(test_image, "test_image (0-1)");
69#define saa7127_dbg(fmt, arg...) \ 69#define saa7127_dbg(fmt, arg...) \
70 do { \ 70 do { \
71 if (debug >= 1) \ 71 if (debug >= 1) \
72 printk(KERN_INFO "%s debug %d-%04x: " fmt, client->driver->name, \ 72 printk(KERN_INFO "%s debug %d-%04x: " fmt, \
73 client->driver->driver.name, \
73 i2c_adapter_id(client->adapter), client->addr , ## arg); \ 74 i2c_adapter_id(client->adapter), client->addr , ## arg); \
74 } while (0) 75 } while (0)
75 76
@@ -77,15 +78,16 @@ MODULE_PARM_DESC(test_image, "test_image (0-1)");
77#define saa7127_dbg_highvol(fmt, arg...) \ 78#define saa7127_dbg_highvol(fmt, arg...) \
78 do { \ 79 do { \
79 if (debug == 2) \ 80 if (debug == 2) \
80 printk(KERN_INFO "%s debug %d-%04x: " fmt, client->driver->name, \ 81 printk(KERN_INFO "%s debug %d-%04x: " fmt, \
82 client->driver->driver.name, \
81 i2c_adapter_id(client->adapter), client->addr , ## arg); \ 83 i2c_adapter_id(client->adapter), client->addr , ## arg); \
82 } while (0) 84 } while (0)
83 85
84#define saa7127_err(fmt, arg...) do { \ 86#define saa7127_err(fmt, arg...) do { \
85 printk(KERN_ERR "%s %d-%04x: " fmt, client->driver->name, \ 87 printk(KERN_ERR "%s %d-%04x: " fmt, client->driver->driver.name, \
86 i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0) 88 i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
87#define saa7127_info(fmt, arg...) do { \ 89#define saa7127_info(fmt, arg...) do { \
88 printk(KERN_INFO "%s %d-%04x: " fmt, client->driver->name, \ 90 printk(KERN_INFO "%s %d-%04x: " fmt, client->driver->driver.name, \
89 i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0) 91 i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
90 92
91static unsigned short normal_i2c[] = { 0x88 >> 1, I2C_CLIENT_END }; 93static unsigned short normal_i2c[] = { 0x88 >> 1, I2C_CLIENT_END };
@@ -818,12 +820,14 @@ static int saa7127_detach(struct i2c_client *client)
818/* ----------------------------------------------------------------------- */ 820/* ----------------------------------------------------------------------- */
819 821
820static struct i2c_driver i2c_driver_saa7127 = { 822static struct i2c_driver i2c_driver_saa7127 = {
821 .name = "saa7127", 823 .driver = {
824 .owner = THIS_MODULE,
825 .name = "saa7127",
826 },
822 .id = I2C_DRIVERID_SAA7127, 827 .id = I2C_DRIVERID_SAA7127,
823 .attach_adapter = saa7127_probe, 828 .attach_adapter = saa7127_probe,
824 .detach_client = saa7127_detach, 829 .detach_client = saa7127_detach,
825 .command = saa7127_command, 830 .command = saa7127_command,
826 .owner = THIS_MODULE,
827}; 831};
828 832
829 833
diff --git a/drivers/media/video/saa7134/saa6752hs.c b/drivers/media/video/saa7134/saa6752hs.c
index 68206060c92d..0e8c9ed62b13 100644
--- a/drivers/media/video/saa7134/saa6752hs.c
+++ b/drivers/media/video/saa7134/saa6752hs.c
@@ -597,8 +597,10 @@ saa6752hs_command(struct i2c_client *client, unsigned int cmd, void *arg)
597/* ----------------------------------------------------------------------- */ 597/* ----------------------------------------------------------------------- */
598 598
599static struct i2c_driver driver = { 599static struct i2c_driver driver = {
600 .owner = THIS_MODULE, 600 .driver = {
601 .name = "i2c saa6752hs MPEG encoder", 601 .owner = THIS_MODULE,
602 .name = "i2c saa6752hs MPEG encoder",
603 },
602 .id = I2C_DRIVERID_SAA6752HS, 604 .id = I2C_DRIVERID_SAA6752HS,
603 .attach_adapter = saa6752hs_probe, 605 .attach_adapter = saa6752hs_probe,
604 .detach_client = saa6752hs_detach, 606 .detach_client = saa6752hs_detach,
diff --git a/drivers/media/video/saa7134/saa7134-i2c.c b/drivers/media/video/saa7134/saa7134-i2c.c
index df9dd36721e0..1792d03d621d 100644
--- a/drivers/media/video/saa7134/saa7134-i2c.c
+++ b/drivers/media/video/saa7134/saa7134-i2c.c
@@ -333,7 +333,7 @@ static int attach_inform(struct i2c_client *client)
333 struct tuner_setup tun_setup; 333 struct tuner_setup tun_setup;
334 334
335 d1printk( "%s i2c attach [addr=0x%x,client=%s]\n", 335 d1printk( "%s i2c attach [addr=0x%x,client=%s]\n",
336 client->driver->name, client->addr, client->name); 336 client->driver->driver.name, client->addr, client->name);
337 337
338 /* Am I an i2c remote control? */ 338 /* Am I an i2c remote control? */
339 339
@@ -343,7 +343,7 @@ static int attach_inform(struct i2c_client *client)
343 { 343 {
344 struct IR_i2c *ir = i2c_get_clientdata(client); 344 struct IR_i2c *ir = i2c_get_clientdata(client);
345 d1printk("%s i2c IR detected (%s).\n", 345 d1printk("%s i2c IR detected (%s).\n",
346 client->driver->name,ir->phys); 346 client->driver->driver.name, ir->phys);
347 saa7134_set_i2c_ir(dev,ir); 347 saa7134_set_i2c_ir(dev,ir);
348 break; 348 break;
349 } 349 }
diff --git a/drivers/media/video/saa7185.c b/drivers/media/video/saa7185.c
index 9f37585d3f73..64047d77388c 100644
--- a/drivers/media/video/saa7185.c
+++ b/drivers/media/video/saa7185.c
@@ -486,8 +486,10 @@ saa7185_detach_client (struct i2c_client *client)
486/* ----------------------------------------------------------------------- */ 486/* ----------------------------------------------------------------------- */
487 487
488static struct i2c_driver i2c_driver_saa7185 = { 488static struct i2c_driver i2c_driver_saa7185 = {
489 .owner = THIS_MODULE, 489 .driver = {
490 .name = "saa7185", /* name */ 490 .owner = THIS_MODULE,
491 .name = "saa7185", /* name */
492 },
491 493
492 .id = I2C_DRIVERID_SAA7185B, 494 .id = I2C_DRIVERID_SAA7185B,
493 495
diff --git a/drivers/media/video/saa7191.c b/drivers/media/video/saa7191.c
index 6be98fc0fe24..a0f8eaf251ef 100644
--- a/drivers/media/video/saa7191.c
+++ b/drivers/media/video/saa7191.c
@@ -788,8 +788,10 @@ static int saa7191_command(struct i2c_client *client, unsigned int cmd,
788} 788}
789 789
790static struct i2c_driver i2c_driver_saa7191 = { 790static struct i2c_driver i2c_driver_saa7191 = {
791 .owner = THIS_MODULE, 791 .driver = {
792 .name = "saa7191", 792 .owner = THIS_MODULE,
793 .name = "saa7191",
794 },
793 .id = I2C_DRIVERID_SAA7191, 795 .id = I2C_DRIVERID_SAA7191,
794 .attach_adapter = saa7191_probe, 796 .attach_adapter = saa7191_probe,
795 .detach_client = saa7191_detach, 797 .detach_client = saa7191_detach,
diff --git a/drivers/media/video/tda7432.c b/drivers/media/video/tda7432.c
index 239a58666a12..59674d928ff7 100644
--- a/drivers/media/video/tda7432.c
+++ b/drivers/media/video/tda7432.c
@@ -501,8 +501,10 @@ static int tda7432_command(struct i2c_client *client,
501} 501}
502 502
503static struct i2c_driver driver = { 503static struct i2c_driver driver = {
504 .owner = THIS_MODULE, 504 .driver = {
505 .name = "i2c tda7432 driver", 505 .owner = THIS_MODULE,
506 .name = "i2c tda7432 driver",
507 },
506 .id = I2C_DRIVERID_TDA7432, 508 .id = I2C_DRIVERID_TDA7432,
507 .attach_adapter = tda7432_probe, 509 .attach_adapter = tda7432_probe,
508 .detach_client = tda7432_detach, 510 .detach_client = tda7432_detach,
diff --git a/drivers/media/video/tda9840.c b/drivers/media/video/tda9840.c
index f29fb507075d..8efc726874fc 100644
--- a/drivers/media/video/tda9840.c
+++ b/drivers/media/video/tda9840.c
@@ -221,8 +221,10 @@ static int detach(struct i2c_client *client)
221} 221}
222 222
223static struct i2c_driver driver = { 223static struct i2c_driver driver = {
224 .owner = THIS_MODULE, 224 .driver = {
225 .name = "tda9840", 225 .owner = THIS_MODULE,
226 .name = "tda9840",
227 },
226 .id = I2C_DRIVERID_TDA9840, 228 .id = I2C_DRIVERID_TDA9840,
227 .attach_adapter = attach, 229 .attach_adapter = attach,
228 .detach_client = detach, 230 .detach_client = detach,
diff --git a/drivers/media/video/tda9875.c b/drivers/media/video/tda9875.c
index d053b6445502..de896167029e 100644
--- a/drivers/media/video/tda9875.c
+++ b/drivers/media/video/tda9875.c
@@ -372,8 +372,10 @@ static int tda9875_command(struct i2c_client *client,
372 372
373 373
374static struct i2c_driver driver = { 374static struct i2c_driver driver = {
375 .owner = THIS_MODULE, 375 .driver = {
376 .name = "i2c tda9875 driver", 376 .owner = THIS_MODULE,
377 .name = "i2c tda9875 driver",
378 },
377 .id = I2C_DRIVERID_TDA9875, 379 .id = I2C_DRIVERID_TDA9875,
378 .attach_adapter = tda9875_probe, 380 .attach_adapter = tda9875_probe,
379 .detach_client = tda9875_detach, 381 .detach_client = tda9875_detach,
diff --git a/drivers/media/video/tda9887.c b/drivers/media/video/tda9887.c
index 324f61bf714e..081f47805158 100644
--- a/drivers/media/video/tda9887.c
+++ b/drivers/media/video/tda9887.c
@@ -819,13 +819,13 @@ static int tda9887_resume(struct device * dev)
819/* ----------------------------------------------------------------------- */ 819/* ----------------------------------------------------------------------- */
820 820
821static struct i2c_driver driver = { 821static struct i2c_driver driver = {
822 .owner = THIS_MODULE,
823 .name = "i2c tda9887 driver",
824 .id = -1, /* FIXME */ 822 .id = -1, /* FIXME */
825 .attach_adapter = tda9887_probe, 823 .attach_adapter = tda9887_probe,
826 .detach_client = tda9887_detach, 824 .detach_client = tda9887_detach,
827 .command = tda9887_command, 825 .command = tda9887_command,
828 .driver = { 826 .driver = {
827 .owner = THIS_MODULE,
828 .name = "i2c tda9887 driver",
829 .suspend = tda9887_suspend, 829 .suspend = tda9887_suspend,
830 .resume = tda9887_resume, 830 .resume = tda9887_resume,
831 }, 831 },
diff --git a/drivers/media/video/tea6415c.c b/drivers/media/video/tea6415c.c
index 96d88ce60c98..e7e2213c39e1 100644
--- a/drivers/media/video/tea6415c.c
+++ b/drivers/media/video/tea6415c.c
@@ -190,8 +190,10 @@ static int command(struct i2c_client *client, unsigned int cmd, void *arg)
190} 190}
191 191
192static struct i2c_driver driver = { 192static struct i2c_driver driver = {
193 .owner = THIS_MODULE, 193 .driver = {
194 .name = "tea6415c", 194 .owner = THIS_MODULE,
195 .name = "tea6415c",
196 },
195 .id = I2C_DRIVERID_TEA6415C, 197 .id = I2C_DRIVERID_TEA6415C,
196 .attach_adapter = attach, 198 .attach_adapter = attach,
197 .detach_client = detach, 199 .detach_client = detach,
diff --git a/drivers/media/video/tea6420.c b/drivers/media/video/tea6420.c
index fd417de95847..74cc25f04056 100644
--- a/drivers/media/video/tea6420.c
+++ b/drivers/media/video/tea6420.c
@@ -167,8 +167,10 @@ static int command(struct i2c_client *client, unsigned int cmd, void *arg)
167} 167}
168 168
169static struct i2c_driver driver = { 169static struct i2c_driver driver = {
170 .owner = THIS_MODULE, 170 .driver = {
171 .name = "tea6420", 171 .owner = THIS_MODULE,
172 .name = "tea6420",
173 },
172 .id = I2C_DRIVERID_TEA6420, 174 .id = I2C_DRIVERID_TEA6420,
173 .attach_adapter = attach, 175 .attach_adapter = attach,
174 .detach_client = detach, 176 .detach_client = detach,
diff --git a/drivers/media/video/tuner-3036.c b/drivers/media/video/tuner-3036.c
index 3505cec2e65a..83257af8db41 100644
--- a/drivers/media/video/tuner-3036.c
+++ b/drivers/media/video/tuner-3036.c
@@ -175,8 +175,10 @@ tuner_probe(struct i2c_adapter *adap)
175static struct i2c_driver 175static struct i2c_driver
176i2c_driver_tuner = 176i2c_driver_tuner =
177{ 177{
178 .owner = THIS_MODULE, 178 .driver = {
179 .name = "sab3036", 179 .owner = THIS_MODULE,
180 .name = "sab3036",
181 },
180 .id = I2C_DRIVERID_SAB3036, 182 .id = I2C_DRIVERID_SAB3036,
181 .attach_adapter = tuner_probe, 183 .attach_adapter = tuner_probe,
182 .detach_client = tuner_detach, 184 .detach_client = tuner_detach,
diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c
index 6328f0954e70..e8c854948de9 100644
--- a/drivers/media/video/tuner-core.c
+++ b/drivers/media/video/tuner-core.c
@@ -206,7 +206,7 @@ static void set_type(struct i2c_client *c, unsigned int type,
206 206
207 set_freq(c, t->freq); 207 set_freq(c, t->freq);
208 tuner_dbg("%s %s I2C addr 0x%02x with type %d used for 0x%02x\n", 208 tuner_dbg("%s %s I2C addr 0x%02x with type %d used for 0x%02x\n",
209 c->adapter->name, c->driver->name, c->addr << 1, type, 209 c->adapter->name, c->driver->driver.name, c->addr << 1, type,
210 t->mode_mask); 210 t->mode_mask);
211} 211}
212 212
@@ -742,13 +742,13 @@ static int tuner_resume(struct device *dev)
742/* ----------------------------------------------------------------------- */ 742/* ----------------------------------------------------------------------- */
743 743
744static struct i2c_driver driver = { 744static struct i2c_driver driver = {
745 .owner = THIS_MODULE,
746 .name = "tuner",
747 .id = I2C_DRIVERID_TUNER, 745 .id = I2C_DRIVERID_TUNER,
748 .attach_adapter = tuner_probe, 746 .attach_adapter = tuner_probe,
749 .detach_client = tuner_detach, 747 .detach_client = tuner_detach,
750 .command = tuner_command, 748 .command = tuner_command,
751 .driver = { 749 .driver = {
750 .owner = THIS_MODULE,
751 .name = "tuner",
752 .suspend = tuner_suspend, 752 .suspend = tuner_suspend,
753 .resume = tuner_resume, 753 .resume = tuner_resume,
754 }, 754 },
diff --git a/drivers/media/video/tvaudio.c b/drivers/media/video/tvaudio.c
index 4f1f339283e0..30bb2a3615e9 100644
--- a/drivers/media/video/tvaudio.c
+++ b/drivers/media/video/tvaudio.c
@@ -1702,8 +1702,10 @@ static int chip_command(struct i2c_client *client,
1702 1702
1703 1703
1704static struct i2c_driver driver = { 1704static struct i2c_driver driver = {
1705 .owner = THIS_MODULE, 1705 .driver = {
1706 .name = "generic i2c audio driver", 1706 .owner = THIS_MODULE,
1707 .name = "generic i2c audio driver",
1708 },
1707 .id = I2C_DRIVERID_TVAUDIO, 1709 .id = I2C_DRIVERID_TVAUDIO,
1708 .attach_adapter = chip_probe, 1710 .attach_adapter = chip_probe,
1709 .detach_client = chip_detach, 1711 .detach_client = chip_detach,
diff --git a/drivers/media/video/tveeprom.c b/drivers/media/video/tveeprom.c
index d833b651073a..d8b5a1781809 100644
--- a/drivers/media/video/tveeprom.c
+++ b/drivers/media/video/tveeprom.c
@@ -778,8 +778,10 @@ tveeprom_detach_client (struct i2c_client *client)
778} 778}
779 779
780static struct i2c_driver i2c_driver_tveeprom = { 780static struct i2c_driver i2c_driver_tveeprom = {
781 .owner = THIS_MODULE, 781 .driver = {
782 .name = "tveeprom", 782 .owner = THIS_MODULE,
783 .name = "tveeprom",
784 },
783 .id = I2C_DRIVERID_TVEEPROM, 785 .id = I2C_DRIVERID_TVEEPROM,
784 .attach_adapter = tveeprom_attach_adapter, 786 .attach_adapter = tveeprom_attach_adapter,
785 .detach_client = tveeprom_detach_client, 787 .detach_client = tveeprom_detach_client,
diff --git a/drivers/media/video/tvmixer.c b/drivers/media/video/tvmixer.c
index 936e01d2c785..5f4d01854767 100644
--- a/drivers/media/video/tvmixer.c
+++ b/drivers/media/video/tvmixer.c
@@ -228,9 +228,13 @@ static int tvmixer_release(struct inode *inode, struct file *file)
228 228
229static struct i2c_driver driver = { 229static struct i2c_driver driver = {
230#ifdef I2C_PEC 230#ifdef I2C_PEC
231 .owner = THIS_MODULE, 231 .driver = {
232#endif 232 .owner = THIS_MODULE,
233 .name = "tv card mixer driver",
234 },
235#else
233 .name = "tv card mixer driver", 236 .name = "tv card mixer driver",
237#endif
234 .id = I2C_DRIVERID_TVMIXER, 238 .id = I2C_DRIVERID_TVMIXER,
235 .detach_adapter = tvmixer_adapters, 239 .detach_adapter = tvmixer_adapters,
236 .attach_adapter = tvmixer_adapters, 240 .attach_adapter = tvmixer_adapters,
diff --git a/drivers/media/video/tvp5150.c b/drivers/media/video/tvp5150.c
index 3734554fc73b..5eca71fa8cbd 100644
--- a/drivers/media/video/tvp5150.c
+++ b/drivers/media/video/tvp5150.c
@@ -800,8 +800,10 @@ static int tvp5150_detach_client(struct i2c_client *client)
800/* ----------------------------------------------------------------------- */ 800/* ----------------------------------------------------------------------- */
801 801
802static struct i2c_driver driver = { 802static struct i2c_driver driver = {
803 .owner = THIS_MODULE, 803 .driver = {
804 .name = "tvp5150", 804 .owner = THIS_MODULE,
805 .name = "tvp5150",
806 },
805 807
806 /* FIXME */ 808 /* FIXME */
807 .id = I2C_DRIVERID_SAA7110, 809 .id = I2C_DRIVERID_SAA7110,
diff --git a/drivers/media/video/vpx3220.c b/drivers/media/video/vpx3220.c
index 54bc888c3891..b85b5981fb8d 100644
--- a/drivers/media/video/vpx3220.c
+++ b/drivers/media/video/vpx3220.c
@@ -721,8 +721,10 @@ vpx3220_attach_adapter (struct i2c_adapter *adapter)
721 */ 721 */
722 722
723static struct i2c_driver vpx3220_i2c_driver = { 723static struct i2c_driver vpx3220_i2c_driver = {
724 .owner = THIS_MODULE, 724 .driver = {
725 .name = "vpx3220", 725 .owner = THIS_MODULE,
726 .name = "vpx3220",
727 },
726 728
727 .id = I2C_DRIVERID_VPX3220, 729 .id = I2C_DRIVERID_VPX3220,
728 730
diff --git a/drivers/media/video/wm8775.c b/drivers/media/video/wm8775.c
index 527c2591749a..22875f1fa1ab 100644
--- a/drivers/media/video/wm8775.c
+++ b/drivers/media/video/wm8775.c
@@ -40,10 +40,10 @@ MODULE_AUTHOR("Ulf Eklund, Hans Verkuil");
40MODULE_LICENSE("GPL"); 40MODULE_LICENSE("GPL");
41 41
42#define wm8775_err(fmt, arg...) do { \ 42#define wm8775_err(fmt, arg...) do { \
43 printk(KERN_ERR "%s %d-%04x: " fmt, client->driver->name, \ 43 printk(KERN_ERR "%s %d-%04x: " fmt, client->driver->driver.name, \
44 i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0) 44 i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
45#define wm8775_info(fmt, arg...) do { \ 45#define wm8775_info(fmt, arg...) do { \
46 printk(KERN_INFO "%s %d-%04x: " fmt, client->driver->name, \ 46 printk(KERN_INFO "%s %d-%04x: " fmt, client->driver->driver.name, \
47 i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0) 47 i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
48 48
49 49
@@ -232,14 +232,16 @@ static int wm8775_detach(struct i2c_client *client)
232 232
233/* i2c implementation */ 233/* i2c implementation */
234static struct i2c_driver i2c_driver = { 234static struct i2c_driver i2c_driver = {
235 .name = "wm8775", 235 .driver = {
236 .owner = THIS_MODULE,
237 .name = "wm8775",
238 },
236 239
237 .id = I2C_DRIVERID_WM8775, 240 .id = I2C_DRIVERID_WM8775,
238 241
239 .attach_adapter = wm8775_probe, 242 .attach_adapter = wm8775_probe,
240 .detach_client = wm8775_detach, 243 .detach_client = wm8775_detach,
241 .command = wm8775_command, 244 .command = wm8775_command,
242 .owner = THIS_MODULE,
243}; 245};
244 246
245 247
diff --git a/drivers/media/video/zoran_driver.c b/drivers/media/video/zoran_driver.c
index 07bde9acd672..4034f1b45366 100644
--- a/drivers/media/video/zoran_driver.c
+++ b/drivers/media/video/zoran_driver.c
@@ -1311,7 +1311,7 @@ zoran_open (struct inode *inode,
1311 res = -ENODEV; 1311 res = -ENODEV;
1312 goto open_unlock_and_return; 1312 goto open_unlock_and_return;
1313 } 1313 }
1314 if (!try_module_get(zr->decoder->driver->owner)) { 1314 if (!try_module_get(zr->decoder->driver->driver.owner)) {
1315 dprintk(1, 1315 dprintk(1,
1316 KERN_ERR 1316 KERN_ERR
1317 "%s: failed to grab ownership of i2c decoder\n", 1317 "%s: failed to grab ownership of i2c decoder\n",
@@ -1321,13 +1321,13 @@ zoran_open (struct inode *inode,
1321 goto open_unlock_and_return; 1321 goto open_unlock_and_return;
1322 } 1322 }
1323 if (zr->encoder && 1323 if (zr->encoder &&
1324 !try_module_get(zr->encoder->driver->owner)) { 1324 !try_module_get(zr->encoder->driver->driver.owner)) {
1325 dprintk(1, 1325 dprintk(1,
1326 KERN_ERR 1326 KERN_ERR
1327 "%s: failed to grab ownership of i2c encoder\n", 1327 "%s: failed to grab ownership of i2c encoder\n",
1328 ZR_DEVNAME(zr)); 1328 ZR_DEVNAME(zr));
1329 res = -EIO; 1329 res = -EIO;
1330 module_put(zr->decoder->driver->owner); 1330 module_put(zr->decoder->driver->driver.owner);
1331 module_put(THIS_MODULE); 1331 module_put(THIS_MODULE);
1332 goto open_unlock_and_return; 1332 goto open_unlock_and_return;
1333 } 1333 }
@@ -1393,9 +1393,9 @@ zoran_open (struct inode *inode,
1393open_unlock_and_return: 1393open_unlock_and_return:
1394 /* if we grabbed locks, release them accordingly */ 1394 /* if we grabbed locks, release them accordingly */
1395 if (have_module_locks) { 1395 if (have_module_locks) {
1396 module_put(zr->decoder->driver->owner); 1396 module_put(zr->decoder->driver->driver.owner);
1397 if (zr->encoder) { 1397 if (zr->encoder) {
1398 module_put(zr->encoder->driver->owner); 1398 module_put(zr->encoder->driver->driver.owner);
1399 } 1399 }
1400 module_put(THIS_MODULE); 1400 module_put(THIS_MODULE);
1401 } 1401 }
@@ -1461,9 +1461,9 @@ zoran_close (struct inode *inode,
1461 kfree(fh); 1461 kfree(fh);
1462 1462
1463 /* release locks on the i2c modules */ 1463 /* release locks on the i2c modules */
1464 module_put(zr->decoder->driver->owner); 1464 module_put(zr->decoder->driver->driver.owner);
1465 if (zr->encoder) { 1465 if (zr->encoder) {
1466 module_put(zr->encoder->driver->owner); 1466 module_put(zr->encoder->driver->driver.owner);
1467 } 1467 }
1468 module_put(THIS_MODULE); 1468 module_put(THIS_MODULE);
1469 1469
diff --git a/drivers/usb/media/w9968cf.c b/drivers/usb/media/w9968cf.c
index 04d69339c054..3605a6f3067b 100644
--- a/drivers/usb/media/w9968cf.c
+++ b/drivers/usb/media/w9968cf.c
@@ -1533,12 +1533,12 @@ static int w9968cf_i2c_attach_inform(struct i2c_client* client)
1533 } 1533 }
1534 } else { 1534 } else {
1535 DBG(4, "Rejected client [%s] with driver [%s]", 1535 DBG(4, "Rejected client [%s] with driver [%s]",
1536 client->name, client->driver->name) 1536 client->name, client->driver->driver.name)
1537 return -EINVAL; 1537 return -EINVAL;
1538 } 1538 }
1539 1539
1540 DBG(5, "I2C attach client [%s] with driver [%s]", 1540 DBG(5, "I2C attach client [%s] with driver [%s]",
1541 client->name, client->driver->name) 1541 client->name, client->driver->driver.name)
1542 1542
1543 return 0; 1543 return 0;
1544} 1544}
diff --git a/include/media/tuner.h b/include/media/tuner.h
index faa0f8e3091b..b37cde606692 100644
--- a/include/media/tuner.h
+++ b/include/media/tuner.h
@@ -218,14 +218,15 @@ extern int default_tuner_init(struct i2c_client *c);
218extern int tea5767_autodetection(struct i2c_client *c); 218extern int tea5767_autodetection(struct i2c_client *c);
219 219
220#define tuner_warn(fmt, arg...) do {\ 220#define tuner_warn(fmt, arg...) do {\
221 printk(KERN_WARNING "%s %d-%04x: " fmt, t->i2c.driver->name, \ 221 printk(KERN_WARNING "%s %d-%04x: " fmt, t->i2c.driver->driver.name, \
222 t->i2c.adapter->nr, t->i2c.addr , ##arg); } while (0) 222 t->i2c.adapter->nr, t->i2c.addr , ##arg); } while (0)
223#define tuner_info(fmt, arg...) do {\ 223#define tuner_info(fmt, arg...) do {\
224 printk(KERN_INFO "%s %d-%04x: " fmt, t->i2c.driver->name, \ 224 printk(KERN_INFO "%s %d-%04x: " fmt, t->i2c.driver->driver.name, \
225 t->i2c.adapter->nr, t->i2c.addr , ##arg); } while (0) 225 t->i2c.adapter->nr, t->i2c.addr , ##arg); } while (0)
226#define tuner_dbg(fmt, arg...) do {\ 226#define tuner_dbg(fmt, arg...) do {\
227 if (tuner_debug) \ 227 if (tuner_debug) \
228 printk(KERN_DEBUG "%s %d-%04x: " fmt, t->i2c.driver->name, \ 228 printk(KERN_DEBUG "%s %d-%04x: " fmt, \
229 t->i2c.driver->driver.name, \
229 t->i2c.adapter->nr, t->i2c.addr , ##arg); } while (0) 230 t->i2c.adapter->nr, t->i2c.addr , ##arg); } while (0)
230 231
231#endif /* __KERNEL__ */ 232#endif /* __KERNEL__ */