43 files changed, 187 insertions, 108 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)
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver i2c_driver_adv7170 = {
-        .owner = THIS_MODULE,
-        .name = "adv7170",      /* name */
+        .driver = {
+                .owner = THIS_MODULE,
+                .name = "adv7170",      /* name */
+        },
 
         .id = I2C_DRIVERID_ADV7170,
 
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)
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver i2c_driver_adv7175 = {
-        .owner = THIS_MODULE,
-        .name = "adv7175",      /* name */
+        .driver = {
+                .owner = THIS_MODULE,
+                .name = "adv7175",      /* name */
+        },
 
         .id = I2C_DRIVERID_ADV7175,
 
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)
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver i2c_driver_bt819 = {
-        .owner = THIS_MODULE,
-        .name = "bt819",
+        .driver = {
+                .owner = THIS_MODULE,
+                .name = "bt819",
+        },
 
         .id = I2C_DRIVERID_BT819,
 
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)
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver driver = {
-        .owner          = THIS_MODULE,
-        .name           = "i2c bt832 driver",
+        .driver = {
+                .owner  = THIS_MODULE,
+                .name   = "i2c bt832 driver",
+        },
         .id             = -1, /* FIXME */
         .attach_adapter = bt832_probe,
         .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)
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver i2c_driver_bt856 = {
-        .owner = THIS_MODULE,
-        .name = "bt856",
+        .driver = {
+                .owner = THIS_MODULE,
+                .name = "bt856",
+        },
 
         .id = I2C_DRIVERID_BT856,
 
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)
 
         if (bttv_debug)
                 printk(KERN_DEBUG "bttv%d: %s i2c attach [addr=0x%x,client=%s]\n",
-                        btv->c.nr,client->driver->name,client->addr,
+                        btv->c.nr, client->driver->driver.name, client->addr,
                         client->name);
         if (!client->driver->command)
                 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");
 #define cs53l32a_dbg(fmt, arg...) \
         do { \
                 if (debug) \
-                        printk(KERN_INFO "%s debug %d-%04x: " fmt, client->driver->name, \
+                        printk(KERN_INFO "%s debug %d-%04x: " fmt, \
+                               client->driver->driver.name, \
                                i2c_adapter_id(client->adapter), client->addr , ## arg); \
         } while (0)
 
 #define cs53l32a_err(fmt, arg...) do { \
-        printk(KERN_ERR "%s %d-%04x: " fmt, client->driver->name, \
+        printk(KERN_ERR "%s %d-%04x: " fmt, client->driver->driver.name, \
                 i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
 #define cs53l32a_info(fmt, arg...) do { \
-        printk(KERN_INFO "%s %d-%04x: " fmt, client->driver->name, \
+        printk(KERN_INFO "%s %d-%04x: " fmt, client->driver->driver.name, \
                 i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
 
 static unsigned short normal_i2c[] = { 0x22 >> 1, I2C_CLIENT_END };
@@ -215,12 +216,14 @@ static int cs53l32a_detach(struct i2c_client *client)
 
 /* i2c implementation */
 static struct i2c_driver i2c_driver = {
-        .name = "cs53l32a",
+        .driver = {
+                .owner = THIS_MODULE,
+                .name = "cs53l32a",
+        },
         .id = I2C_DRIVERID_CS53L32A,
         .attach_adapter = cs53l32a_probe,
         .detach_client = cs53l32a_detach,
         .command = cs53l32a_command,
-        .owner = THIS_MODULE,
 };
 
 
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)
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver i2c_driver_cx25840 = {
-        .name = "cx25840",
+        .driver = {
+                .owner = THIS_MODULE,
+                .name = "cx25840",
+        },
 
         .id = I2C_DRIVERID_CX25840,
 
         .attach_adapter = cx25840_attach_adapter,
         .detach_client = cx25840_detach_client,
         .command = cx25840_command,
-        .owner = THIS_MODULE,
 };
 
 
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 @@
 extern int cx25840_debug;
 
 #define cx25840_dbg(fmt, arg...) do { if (cx25840_debug) \
-        printk(KERN_INFO "%s debug %d-%04x: " fmt, client->driver->name, \
+        printk(KERN_INFO "%s debug %d-%04x: " fmt, \
+               client->driver->driver.name, \
                i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
 
 #define cx25840_err(fmt, arg...) do { \
-        printk(KERN_ERR "%s %d-%04x: " fmt, client->driver->name, \
+        printk(KERN_ERR "%s %d-%04x: " fmt, client->driver->driver.name, \
                i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
 
 #define cx25840_info(fmt, arg...) do { \
-        printk(KERN_INFO "%s %d-%04x: " fmt, client->driver->name, \
+        printk(KERN_INFO "%s %d-%04x: " fmt, client->driver->driver.name, \
                i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
 
 #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)
         struct cx88_core *core = i2c_get_adapdata(client->adapter);
 
         dprintk(1, "%s i2c attach [addr=0x%x,client=%s]\n",
-                client->driver->name, client->addr, client->name);
+                client->driver->driver.name, client->addr, client->name);
         if (!client->driver->command)
                 return 0;
 
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,
 }
 
 static struct i2c_driver i2c_driver_indycam = {
-        .owner          = THIS_MODULE,
-        .name           = "indycam",
+        .driver = {
+                .owner  = THIS_MODULE,
+                .name   = "indycam",
+        },
         .id             = I2C_DRIVERID_INDYCAM,
         .attach_adapter = indycam_probe,
         .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);
 static int ir_probe(struct i2c_adapter *adap);
 
 static struct i2c_driver driver = {
-        .name           = "ir remote kbd driver",
+        .driver = {
+                .owner  = THIS_MODULE,
+                .name   = "ir remote kbd driver",
+        },
         .id             = I2C_DRIVERID_INFRARED,
         .attach_adapter = ir_probe,
         .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 @@
 #define msp3400_dbg(fmt, arg...) \
         do { \
                 if (debug) \
-                        printk(KERN_INFO "%s debug %d-%04x: " fmt, client->driver->name, \
+                        printk(KERN_INFO "%s debug %d-%04x: " fmt, \
+                               client->driver->driver.name, \
                                i2c_adapter_id(client->adapter), client->addr , ## arg); \
         } while (0)
 
@@ -67,7 +68,8 @@
 #define msp3400_dbg_mediumvol(fmt, arg...) \
         do { \
                 if (debug >= 2) \
-                        printk(KERN_INFO "%s debug %d-%04x: " fmt, client->driver->name, \
+                        printk(KERN_INFO "%s debug %d-%04x: " fmt, \
+                                client->driver->driver.name, \
                                 i2c_adapter_id(client->adapter), client->addr , ## arg); \
         } while (0)
 
@@ -75,18 +77,19 @@
 #define msp3400_dbg_highvol(fmt, arg...) \
         do { \
                 if (debug >= 16) \
-                        printk(KERN_INFO "%s debug %d-%04x: " fmt, client->driver->name, \
+                        printk(KERN_INFO "%s debug %d-%04x: " fmt, \
+                                client->driver->driver.name, \
                                 i2c_adapter_id(client->adapter), client->addr , ## arg); \
         } while (0)
 
 #define msp3400_err(fmt, arg...) do { \
-        printk(KERN_ERR "%s %d-%04x: " fmt, client->driver->name, \
+        printk(KERN_ERR "%s %d-%04x: " fmt, client->driver->driver.name, \
                 i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
 #define msp3400_warn(fmt, arg...) do { \
-        printk(KERN_WARNING "%s %d-%04x: " fmt, client->driver->name, \
+        printk(KERN_WARNING "%s %d-%04x: " fmt, client->driver->driver.name, \
                 i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
 #define msp3400_info(fmt, arg...) do { \
-        printk(KERN_INFO "%s %d-%04x: " fmt, client->driver->name, \
+        printk(KERN_INFO "%s %d-%04x: " fmt, client->driver->driver.name, \
                 i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
 
 #define OPMODE_AUTO    -1
@@ -1561,13 +1564,13 @@ static int msp_resume(struct device * dev);
 static void msp_wake_thread(struct i2c_client *client);
 
 static struct i2c_driver driver = {
-        .owner          = THIS_MODULE,
-        .name           = "msp3400",
         .id             = I2C_DRIVERID_MSP3400,
         .attach_adapter = msp_probe,
         .detach_client  = msp_detach,
         .command        = msp_command,
         .driver = {
+                .owner   = THIS_MODULE,
+                .name    = "i2c msp3400 driver",
                 .suspend = msp_suspend,
                 .resume  = msp_resume,
         },
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)
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver driver = {
-        .owner =                THIS_MODULE,
-        .name =                 "ovcamchip",
+        .driver = {
+                .owner =        THIS_MODULE,
+                .name =         "ovcamchip",
+        },
         .id =                   I2C_DRIVERID_OVCAMCHIP,
         .class =                I2C_CLASS_CAM_DIGITAL,
         .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,
 
 static struct i2c_driver i2c_driver_videotext =
 {
-        .owner          = THIS_MODULE,
-        .name           = IF_NAME,              /* name */
+        .driver = {
+                .owner  = THIS_MODULE,
+                .name   = IF_NAME,              /* name */
+        },
         .id             = I2C_DRIVERID_SAA5249, /* in i2c.h */
         .attach_adapter = saa5246a_probe,
         .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,
 
 static struct i2c_driver i2c_driver_videotext = 
 {
-        .owner          = THIS_MODULE,
-        .name           = IF_NAME,              /* name */
+        .driver = {
+                .owner  = THIS_MODULE,
+                .name   = IF_NAME,              /* name */
+        },
         .id             = I2C_DRIVERID_SAA5249, /* in i2c.h */
         .attach_adapter = saa5249_probe,
         .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,
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver driver = {
-        .owner = THIS_MODULE,
-        .name = "i2c saa6588 driver",
+        .driver = {
+                .owner = THIS_MODULE,
+                .name = "i2c saa6588 driver",
+        },
         .id = -1,               /* FIXME */
         .attach_adapter = saa6588_probe,
         .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)
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver i2c_driver_saa7110 = {
-        .owner = THIS_MODULE,
-        .name = "saa7110",
+        .driver = {
+                .owner = THIS_MODULE,
+                .name = "saa7110",
+        },
 
         .id = I2C_DRIVERID_SAA7110,
 
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)
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver i2c_driver_saa7111 = {
-        .owner = THIS_MODULE,
-        .name = "saa7111",
+        .driver = {
+                .owner = THIS_MODULE,
+                .name = "saa7111",
+        },
 
         .id = I2C_DRIVERID_SAA7111A,
 
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)
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver i2c_driver_saa7114 = {
-        .owner = THIS_MODULE,
-        .name = "saa7114",
+        .driver = {
+                .owner = THIS_MODULE,
+                .name = "saa7114",
+        },
 
         .id = I2C_DRIVERID_SAA7114,
 
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)");
 #define saa7115_dbg(fmt,arg...) \
         do { \
                 if (debug) \
-                        printk(KERN_INFO "%s debug %d-%04x: " fmt, client->driver->name, \
+                        printk(KERN_INFO "%s debug %d-%04x: " fmt, \
+                               client->driver->driver.name, \
                                i2c_adapter_id(client->adapter), client->addr , ## arg); \
         } while (0)
 
 #define saa7115_err(fmt, arg...) do { \
-        printk(KERN_ERR "%s %d-%04x: " fmt, client->driver->name, \
+        printk(KERN_ERR "%s %d-%04x: " fmt, client->driver->driver.name, \
                i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
 #define saa7115_info(fmt, arg...) do { \
-        printk(KERN_INFO "%s %d-%04x: " fmt, client->driver->name, \
+        printk(KERN_INFO "%s %d-%04x: " fmt, client->driver->driver.name, \
                i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
 
 static unsigned short normal_i2c[] = { 0x42 >> 1, 0x40 >> 1, I2C_CLIENT_END };
@@ -1353,12 +1354,14 @@ static int saa7115_detach(struct i2c_client *client)
 
 /* i2c implementation */
 static struct i2c_driver i2c_driver_saa7115 = {
-        .name = "saa7115",
+        .driver = {
+                .owner = THIS_MODULE,
+                .name = "saa7115",
+        },
         .id = I2C_DRIVERID_SAA711X,
         .attach_adapter = saa7115_probe,
         .detach_client = saa7115_detach,
         .command = saa7115_command,
-        .owner = THIS_MODULE,
 };
 
 
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)
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver i2c_driver_saa711x = {
-        .owner = THIS_MODULE,
-        .name = "saa711x",
+        .driver = {
+                .owner = THIS_MODULE,
+                .name = "saa711x",
+        },
 
         .id = I2C_DRIVERID_SAA711X,
 
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)");
 #define saa7127_dbg(fmt, arg...) \
         do { \
                 if (debug >= 1) \
-                        printk(KERN_INFO "%s debug %d-%04x: " fmt, client->driver->name, \
+                        printk(KERN_INFO "%s debug %d-%04x: " fmt, \
+                               client->driver->driver.name, \
                                i2c_adapter_id(client->adapter), client->addr , ## arg); \
         } while (0)
 
@@ -77,15 +78,16 @@ MODULE_PARM_DESC(test_image, "test_image (0-1)");
 #define saa7127_dbg_highvol(fmt, arg...) \
         do { \
                 if (debug == 2) \
-                        printk(KERN_INFO "%s debug %d-%04x: " fmt, client->driver->name, \
+                        printk(KERN_INFO "%s debug %d-%04x: " fmt, \
+                               client->driver->driver.name, \
                                i2c_adapter_id(client->adapter), client->addr , ## arg); \
         } while (0)
 
 #define saa7127_err(fmt, arg...) do { \
-        printk(KERN_ERR "%s %d-%04x: " fmt, client->driver->name, \
+        printk(KERN_ERR "%s %d-%04x: " fmt, client->driver->driver.name, \
                i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
 #define saa7127_info(fmt, arg...) do { \
-        printk(KERN_INFO "%s %d-%04x: " fmt, client->driver->name, \
+        printk(KERN_INFO "%s %d-%04x: " fmt, client->driver->driver.name, \
                i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
 
 static unsigned short normal_i2c[] = { 0x88 >> 1, I2C_CLIENT_END };
@@ -818,12 +820,14 @@ static int saa7127_detach(struct i2c_client *client)
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver i2c_driver_saa7127 = {
-        .name = "saa7127",
+        .driver = {
+                .owner = THIS_MODULE,
+                .name = "saa7127",
+        },
         .id = I2C_DRIVERID_SAA7127,
         .attach_adapter = saa7127_probe,
         .detach_client = saa7127_detach,
         .command = saa7127_command,
-        .owner = THIS_MODULE,
 };
 
 
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)
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver driver = {
-        .owner          = THIS_MODULE,
-        .name           = "i2c saa6752hs MPEG encoder",
+        .driver = {
+                .owner  = THIS_MODULE,
+                .name   = "i2c saa6752hs MPEG encoder",
+        },
         .id             = I2C_DRIVERID_SAA6752HS,
         .attach_adapter = saa6752hs_probe,
         .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)
         struct tuner_setup tun_setup;
 
         d1printk( "%s i2c attach [addr=0x%x,client=%s]\n",
-                client->driver->name, client->addr, client->name);
+                client->driver->driver.name, client->addr, client->name);
 
         /* Am I an i2c remote control? */
 
@@ -343,7 +343,7 @@ static int attach_inform(struct i2c_client *client)
                 {
                         struct IR_i2c *ir = i2c_get_clientdata(client);
                         d1printk("%s i2c IR detected (%s).\n",
-                                 client->driver->name,ir->phys);
+                                 client->driver->driver.name, ir->phys);
                         saa7134_set_i2c_ir(dev,ir);
                         break;
                 }
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)
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver i2c_driver_saa7185 = {
-        .owner = THIS_MODULE,
-        .name = "saa7185",      /* name */
+        .driver = {
+                .owner = THIS_MODULE,
+                .name = "saa7185",      /* name */
+        },
 
         .id = I2C_DRIVERID_SAA7185B,
 
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,
 }
 
 static struct i2c_driver i2c_driver_saa7191 = {
-        .owner          = THIS_MODULE,
-        .name           = "saa7191",
+        .driver = {
+                .owner  = THIS_MODULE,
+                .name   = "saa7191",
+        },
         .id             = I2C_DRIVERID_SAA7191,
         .attach_adapter = saa7191_probe,
         .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,
 }
 
 static struct i2c_driver driver = {
-        .owner           = THIS_MODULE,
-        .name            = "i2c tda7432 driver",
+        .driver = {
+                .owner   = THIS_MODULE,
+                .name    = "i2c tda7432 driver",
+        },
         .id              = I2C_DRIVERID_TDA7432,
         .attach_adapter  = tda7432_probe,
         .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)
 }
 
 static struct i2c_driver driver = {
-        .owner  = THIS_MODULE,
-        .name   = "tda9840",
+        .driver = {
+                .owner  = THIS_MODULE,
+                .name   = "tda9840",
+        },
         .id     = I2C_DRIVERID_TDA9840,
         .attach_adapter = attach,
         .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,
 
 
 static struct i2c_driver driver = {
-        .owner          = THIS_MODULE,
-        .name           = "i2c tda9875 driver",
+        .driver = {
+                .owner  = THIS_MODULE,
+                .name   = "i2c tda9875 driver",
+        },
         .id             = I2C_DRIVERID_TDA9875,
         .attach_adapter = tda9875_probe,
         .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)
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver driver = {
-        .owner          = THIS_MODULE,
-        .name           = "i2c tda9887 driver",
         .id             = -1, /* FIXME */
         .attach_adapter = tda9887_probe,
         .detach_client  = tda9887_detach,
         .command        = tda9887_command,
         .driver = {
+                .owner   = THIS_MODULE,
+                .name    = "i2c tda9887 driver",
                 .suspend = tda9887_suspend,
                 .resume  = tda9887_resume,
         },
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)
 }
 
 static struct i2c_driver driver = {
-        .owner  = THIS_MODULE,
-        .name   = "tea6415c",
+        .driver = {
+                .owner  = THIS_MODULE,
+                .name   = "tea6415c",
+        },
         .id     = I2C_DRIVERID_TEA6415C,
         .attach_adapter = attach,
         .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)
 }
 
 static struct i2c_driver driver = {
-        .owner  = THIS_MODULE,
-        .name   = "tea6420",
+        .driver = {
+                .owner  = THIS_MODULE,
+                .name   = "tea6420",
+        },
         .id     = I2C_DRIVERID_TEA6420,
         .attach_adapter = attach,
         .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)
 static struct i2c_driver 
 i2c_driver_tuner = 
 {
-        .owner          =       THIS_MODULE,
-        .name           =       "sab3036",
+        .driver = {
+                .owner  =       THIS_MODULE,
+                .name   =       "sab3036",
+        },
         .id             =       I2C_DRIVERID_SAB3036,
         .attach_adapter =       tuner_probe,
         .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,
 
         set_freq(c, t->freq);
         tuner_dbg("%s %s I2C addr 0x%02x with type %d used for 0x%02x\n",
-                  c->adapter->name, c->driver->name, c->addr << 1, type,
+                  c->adapter->name, c->driver->driver.name, c->addr << 1, type,
                   t->mode_mask);
 }
 
@@ -742,13 +742,13 @@ static int tuner_resume(struct device *dev)
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver driver = {
-        .owner = THIS_MODULE,
-        .name = "tuner",
         .id = I2C_DRIVERID_TUNER,
         .attach_adapter = tuner_probe,
         .detach_client = tuner_detach,
         .command = tuner_command,
         .driver = {
+                   .owner = THIS_MODULE,
+                   .name = "tuner",
                    .suspend = tuner_suspend,
                    .resume = tuner_resume,
                    },
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,
 
 
 static struct i2c_driver driver = {
-        .owner           = THIS_MODULE,
-        .name            = "generic i2c audio driver",
+        .driver = {
+                .owner   = THIS_MODULE,
+                .name    = "generic i2c audio driver",
+        },
         .id              = I2C_DRIVERID_TVAUDIO,
         .attach_adapter  = chip_probe,
         .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)
 }
 
 static struct i2c_driver i2c_driver_tveeprom = {
-        .owner          = THIS_MODULE,
-        .name           = "tveeprom",
+        .driver = {
+                .owner  = THIS_MODULE,
+                .name   = "tveeprom",
+        },
         .id             = I2C_DRIVERID_TVEEPROM,
         .attach_adapter = tveeprom_attach_adapter,
         .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)
 
 static struct i2c_driver driver = {
 #ifdef I2C_PEC
-        .owner           = THIS_MODULE,
-#endif
+        .driver = {
+                .owner   = THIS_MODULE,
+                .name    = "tv card mixer driver",
+        },
+#else
         .name            = "tv card mixer driver",
+#endif
         .id              = I2C_DRIVERID_TVMIXER,
         .detach_adapter  = tvmixer_adapters,
         .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)
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver driver = {
-        .owner = THIS_MODULE,
-        .name = "tvp5150",
+        .driver = {
+                .owner = THIS_MODULE,
+                .name = "tvp5150",
+        },
 
         /* FIXME */
         .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)
  */
 
 static struct i2c_driver vpx3220_i2c_driver = {
-        .owner = THIS_MODULE,
-        .name = "vpx3220",
+        .driver = {
+                .owner = THIS_MODULE,
+                .name = "vpx3220",
+        },
 
         .id = I2C_DRIVERID_VPX3220,
 
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");
 MODULE_LICENSE("GPL");
 
 #define wm8775_err(fmt, arg...) do { \
-        printk(KERN_ERR "%s %d-%04x: " fmt, client->driver->name, \
+        printk(KERN_ERR "%s %d-%04x: " fmt, client->driver->driver.name, \
                i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
 #define wm8775_info(fmt, arg...) do { \
-        printk(KERN_INFO "%s %d-%04x: " fmt, client->driver->name, \
+        printk(KERN_INFO "%s %d-%04x: " fmt, client->driver->driver.name, \
                i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
 
 
@@ -232,14 +232,16 @@ static int wm8775_detach(struct i2c_client *client)
 
 /* i2c implementation */
 static struct i2c_driver i2c_driver = {
-        .name = "wm8775",
+        .driver = {
+                .owner = THIS_MODULE,
+                .name = "wm8775",
+        },
 
         .id = I2C_DRIVERID_WM8775,
 
         .attach_adapter = wm8775_probe,
         .detach_client = wm8775_detach,
         .command = wm8775_command,
-        .owner = THIS_MODULE,
 };
 
 
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,
                 res = -ENODEV;
                 goto open_unlock_and_return;
         }
-        if (!try_module_get(zr->decoder->driver->owner)) {
+        if (!try_module_get(zr->decoder->driver->driver.owner)) {
                 dprintk(1,
                         KERN_ERR
                         "%s: failed to grab ownership of i2c decoder\n",
@@ -1321,13 +1321,13 @@ zoran_open (struct inode *inode,
                 goto open_unlock_and_return;
         }
         if (zr->encoder &&
-            !try_module_get(zr->encoder->driver->owner)) {
+            !try_module_get(zr->encoder->driver->driver.owner)) {
                 dprintk(1,
                         KERN_ERR
                         "%s: failed to grab ownership of i2c encoder\n",
                         ZR_DEVNAME(zr));
                 res = -EIO;
-                module_put(zr->decoder->driver->owner);
+                module_put(zr->decoder->driver->driver.owner);
                 module_put(THIS_MODULE);
                 goto open_unlock_and_return;
         }
@@ -1393,9 +1393,9 @@ zoran_open (struct inode *inode,
 open_unlock_and_return:
         /* if we grabbed locks, release them accordingly */
         if (have_module_locks) {
-                module_put(zr->decoder->driver->owner);
+                module_put(zr->decoder->driver->driver.owner);
                 if (zr->encoder) {
-                        module_put(zr->encoder->driver->owner);
+                        module_put(zr->encoder->driver->driver.owner);
                 }
                 module_put(THIS_MODULE);
         }
@@ -1461,9 +1461,9 @@ zoran_close (struct inode *inode,
         kfree(fh);
 
         /* release locks on the i2c modules */
-        module_put(zr->decoder->driver->owner);
+        module_put(zr->decoder->driver->driver.owner);
         if (zr->encoder) {
-                 module_put(zr->encoder->driver->owner);
+                 module_put(zr->encoder->driver->driver.owner);
         }
         module_put(THIS_MODULE);
 
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)
                 }
         } else {
                 DBG(4, "Rejected client [%s] with driver [%s]", 
-                    client->name, client->driver->name)
+                    client->name, client->driver->driver.name)
                 return -EINVAL;
         }
 
         DBG(5, "I2C attach client [%s] with driver [%s]",
-            client->name, client->driver->name)
+            client->name, client->driver->driver.name)
 
         return 0;
 }