43 files changed, 148 insertions, 186 deletions

diff --git a/drivers/media/video/adv7170.c b/drivers/media/video/adv7170.c
index 1ca2b67aedfb..e61003de1d5f 100644
--- a/drivers/media/video/adv7170.c
+++ b/drivers/media/video/adv7170.c
@@ -420,7 +420,6 @@ adv7170_detect_client (struct i2c_adapter *adapter,
         client->addr = address;
         client->adapter = adapter;
         client->driver = &i2c_driver_adv7170;
-        client->flags = I2C_CLIENT_ALLOW_USE;
         if ((client->addr == I2C_ADV7170 >> 1) ||
             (client->addr == (I2C_ADV7170 >> 1) + 1)) {
                 dname = adv7170_name;
@@ -498,11 +497,11 @@ adv7170_detach_client (struct i2c_client *client)
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver i2c_driver_adv7170 = {
-        .owner = THIS_MODULE,
-        .name = "adv7170",      /* name */
+        .driver = {
+                .name = "adv7170",      /* name */
+        },
 
         .id = I2C_DRIVERID_ADV7170,
-        .flags = I2C_DF_NOTIFY,
 
         .attach_adapter = adv7170_attach_adapter,
         .detach_client = adv7170_detach_client,
diff --git a/drivers/media/video/adv7175.c b/drivers/media/video/adv7175.c
index 173bca1e0295..6d9536a71ee4 100644
--- a/drivers/media/video/adv7175.c
+++ b/drivers/media/video/adv7175.c
@@ -470,7 +470,6 @@ adv7175_detect_client (struct i2c_adapter *adapter,
         client->addr = address;
         client->adapter = adapter;
         client->driver = &i2c_driver_adv7175;
-        client->flags = I2C_CLIENT_ALLOW_USE;
         if ((client->addr == I2C_ADV7175 >> 1) ||
             (client->addr == (I2C_ADV7175 >> 1) + 1)) {
                 dname = adv7175_name;
@@ -548,11 +547,11 @@ adv7175_detach_client (struct i2c_client *client)
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver i2c_driver_adv7175 = {
-        .owner = THIS_MODULE,
-        .name = "adv7175",      /* name */
+        .driver = {
+                .name = "adv7175",      /* name */
+        },
 
         .id = I2C_DRIVERID_ADV7175,
-        .flags = I2C_DF_NOTIFY,
 
         .attach_adapter = adv7175_attach_adapter,
         .detach_client = adv7175_detach_client,
diff --git a/drivers/media/video/bt819.c b/drivers/media/video/bt819.c
index 3ee0afca76a7..560b99891753 100644
--- a/drivers/media/video/bt819.c
+++ b/drivers/media/video/bt819.c
@@ -535,7 +535,6 @@ bt819_detect_client (struct i2c_adapter *adapter,
         client->addr = address;
         client->adapter = adapter;
         client->driver = &i2c_driver_bt819;
-        client->flags = I2C_CLIENT_ALLOW_USE;
 
         decoder = kmalloc(sizeof(struct bt819), GFP_KERNEL);
         if (decoder == NULL) {
@@ -623,11 +622,11 @@ bt819_detach_client (struct i2c_client *client)
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver i2c_driver_bt819 = {
-        .owner = THIS_MODULE,
-        .name = "bt819",
+        .driver = {
+                .name = "bt819",
+        },
 
         .id = I2C_DRIVERID_BT819,
-        .flags = I2C_DF_NOTIFY,
 
         .attach_adapter = bt819_attach_adapter,
         .detach_client = bt819_detach_client,
diff --git a/drivers/media/video/bt832.c b/drivers/media/video/bt832.c
index 3ca1d768bfd3..1c3ff5f38a6d 100644
--- a/drivers/media/video/bt832.c
+++ b/drivers/media/video/bt832.c
@@ -230,10 +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 = {
+                .name   = "i2c bt832 driver",
+        },
         .id             = -1, /* FIXME */
-        .flags          = I2C_DF_NOTIFY,
         .attach_adapter = bt832_probe,
         .detach_client  = bt832_detach,
         .command        = bt832_command,
@@ -241,7 +241,6 @@ static struct i2c_driver driver = {
 static struct i2c_client client_template =
 {
         .name       = "bt832",
-        .flags      = I2C_CLIENT_ALLOW_USE,
         .driver     = &driver,
 };
 
diff --git a/drivers/media/video/bt856.c b/drivers/media/video/bt856.c
index 8eb871d0e85b..60508069bbed 100644
--- a/drivers/media/video/bt856.c
+++ b/drivers/media/video/bt856.c
@@ -323,7 +323,6 @@ bt856_detect_client (struct i2c_adapter *adapter,
         client->addr = address;
         client->adapter = adapter;
         client->driver = &i2c_driver_bt856;
-        client->flags = I2C_CLIENT_ALLOW_USE;
         strlcpy(I2C_NAME(client), "bt856", sizeof(I2C_NAME(client)));
 
         encoder = kmalloc(sizeof(struct bt856), GFP_KERNEL);
@@ -405,11 +404,11 @@ bt856_detach_client (struct i2c_client *client)
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver i2c_driver_bt856 = {
-        .owner = THIS_MODULE,
-        .name = "bt856",
+        .driver = {
+                .name = "bt856",
+        },
 
         .id = I2C_DRIVERID_BT856,
-        .flags = I2C_DF_NOTIFY,
 
         .attach_adapter = bt856_attach_adapter,
         .detach_client = bt856_detach_client,
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 780b352ec119..643ead1a87ee 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 };
@@ -154,7 +155,6 @@ static int cs53l32a_attach(struct i2c_adapter *adapter, int address, int kind)
         client->addr = address;
         client->adapter = adapter;
         client->driver = &i2c_driver;
-        client->flags = I2C_CLIENT_ALLOW_USE;
         snprintf(client->name, sizeof(client->name) - 1, "cs53l32a");
 
         cs53l32a_info("chip found @ 0x%x (%s)\n", address << 1, adapter->name);
@@ -216,13 +216,13 @@ static int cs53l32a_detach(struct i2c_client *client)
 
 /* i2c implementation */
 static struct i2c_driver i2c_driver = {
-        .name = "cs53l32a",
+        .driver = {
+                .name = "cs53l32a",
+        },
         .id = I2C_DRIVERID_CS53L32A,
-        .flags = I2C_DF_NOTIFY,
         .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 5b93723a1768..3b09f46dddf6 100644
--- a/drivers/media/video/cx25840/cx25840-core.c
+++ b/drivers/media/video/cx25840/cx25840-core.c
@@ -773,7 +773,6 @@ static int cx25840_detect_client(struct i2c_adapter *adapter, int address,
         client->addr = address;
         client->adapter = adapter;
         client->driver = &i2c_driver_cx25840;
-        client->flags = I2C_CLIENT_ALLOW_USE;
         snprintf(client->name, sizeof(client->name) - 1, "cx25840");
 
         cx25840_dbg("detecting cx25840 client on address 0x%x\n", address << 1);
@@ -844,15 +843,15 @@ static int cx25840_detach_client(struct i2c_client *client)
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver i2c_driver_cx25840 = {
-        .name = "cx25840",
+        .driver = {
+                .name = "cx25840",
+        },
 
         .id = I2C_DRIVERID_CX25840,
-        .flags = I2C_DF_NOTIFY,
 
         .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/em28xx/em28xx-i2c.c b/drivers/media/video/em28xx/em28xx-i2c.c
index 7f5603054f02..d14bcf4ceaea 100644
--- a/drivers/media/video/em28xx/em28xx-i2c.c
+++ b/drivers/media/video/em28xx/em28xx-i2c.c
@@ -497,7 +497,6 @@ static struct i2c_adapter em28xx_adap_template = {
 
 static struct i2c_client em28xx_client_template = {
         .name = "em28xx internal",
-        .flags = I2C_CLIENT_ALLOW_USE,
 };
 
 /* ----------------------------------------------------------- */
diff --git a/drivers/media/video/indycam.c b/drivers/media/video/indycam.c
index deeef125eb92..bb5cbecffcc3 100644
--- a/drivers/media/video/indycam.c
+++ b/drivers/media/video/indycam.c
@@ -451,10 +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 = {
+                .name   = "indycam",
+        },
         .id             = I2C_DRIVERID_INDYCAM,
-        .flags          = I2C_DF_NOTIFY,
         .attach_adapter = indycam_probe,
         .detach_client  = indycam_detach,
         .command        = indycam_command,
diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c
index 740e543311af..3cc1d6a6019b 100644
--- a/drivers/media/video/ir-kbd-i2c.c
+++ b/drivers/media/video/ir-kbd-i2c.c
@@ -278,9 +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 = {
+                .name   = "ir remote kbd driver",
+        },
         .id             = I2C_DRIVERID_INFRARED,
-        .flags          = I2C_DF_NOTIFY,
         .attach_adapter = ir_probe,
         .detach_client  = ir_detach,
 };
diff --git a/drivers/media/video/msp3400.c b/drivers/media/video/msp3400.c
index d86f8e92e534..183253e2dd91 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,14 +1564,12 @@ 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,
-        .flags          = I2C_DF_NOTIFY,
         .attach_adapter = msp_probe,
         .detach_client  = msp_detach,
         .command        = msp_command,
         .driver = {
+                .name    = "i2c msp3400 driver",
                 .suspend = msp_suspend,
                 .resume  = msp_resume,
         },
@@ -1577,7 +1578,6 @@ static struct i2c_driver driver = {
 static struct i2c_client client_template =
 {
         .name      = "(unset)",
-        .flags     = I2C_CLIENT_ALLOW_USE,
         .driver    = &driver,
 };
 
diff --git a/drivers/media/video/ovcamchip/ovcamchip_core.c b/drivers/media/video/ovcamchip/ovcamchip_core.c
index 2de34ebf0673..428f1bb75ec3 100644
--- a/drivers/media/video/ovcamchip/ovcamchip_core.c
+++ b/drivers/media/video/ovcamchip/ovcamchip_core.c
@@ -410,11 +410,11 @@ static int ovcamchip_command(struct i2c_client *c, unsigned int cmd, void *arg)
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver driver = {
-        .owner =                THIS_MODULE,
-        .name =                 "ovcamchip",
+        .driver = {
+                .name =         "ovcamchip",
+        },
         .id =                   I2C_DRIVERID_OVCAMCHIP,
         .class =                I2C_CLASS_CAM_DIGITAL,
-        .flags =                I2C_DF_NOTIFY,
         .attach_adapter =       ovcamchip_attach,
         .detach_client =        ovcamchip_detach,
         .command =              ovcamchip_command,
diff --git a/drivers/media/video/saa5246a.c b/drivers/media/video/saa5246a.c
index b8054da31ffd..0aa9e72f632c 100644
--- a/drivers/media/video/saa5246a.c
+++ b/drivers/media/video/saa5246a.c
@@ -151,25 +151,18 @@ static int saa5246a_detach(struct i2c_client *client)
         return 0;
 }
 
-static int saa5246a_command(struct i2c_client *device, unsigned int cmd,
-        void *arg)
-{
-        return -EINVAL;
-}
-
 /*
  *      I2C interfaces
  */
 
 static struct i2c_driver i2c_driver_videotext =
 {
-        .owner          = THIS_MODULE,
-        .name           = IF_NAME,              /* name */
+        .driver = {
+                .name   = IF_NAME,              /* name */
+        },
         .id             = I2C_DRIVERID_SAA5249, /* in i2c.h */
-        .flags          = I2C_DF_NOTIFY,
         .attach_adapter = saa5246a_probe,
         .detach_client  = saa5246a_detach,
-        .command        = saa5246a_command
 };
 
 static struct i2c_client client_template = {
diff --git a/drivers/media/video/saa5249.c b/drivers/media/video/saa5249.c
index 7ffa2e9a9bf3..a51c7bd96618 100644
--- a/drivers/media/video/saa5249.c
+++ b/drivers/media/video/saa5249.c
@@ -226,23 +226,16 @@ static int saa5249_detach(struct i2c_client *client)
         return 0;
 }
 
-static int saa5249_command(struct i2c_client *device,
-                             unsigned int cmd, void *arg)
-{
-        return -EINVAL;
-}
-
 /* new I2C driver support */
 
 static struct i2c_driver i2c_driver_videotext = 
 {
-        .owner          = THIS_MODULE,
-        .name           = IF_NAME,              /* name */
+        .driver = {
+                .name   = IF_NAME,              /* name */
+        },
         .id             = I2C_DRIVERID_SAA5249, /* in i2c.h */
-        .flags          = I2C_DF_NOTIFY,
         .attach_adapter = saa5249_probe,
         .detach_client  = saa5249_detach,
-        .command        = saa5249_command
 };
 
 static struct i2c_client client_template = {
diff --git a/drivers/media/video/saa6588.c b/drivers/media/video/saa6588.c
index 923322503e8f..d60a783e0473 100644
--- a/drivers/media/video/saa6588.c
+++ b/drivers/media/video/saa6588.c
@@ -495,10 +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 = {
+                .name = "i2c saa6588 driver",
+        },
         .id = -1,               /* FIXME */
-        .flags = I2C_DF_NOTIFY,
         .attach_adapter = saa6588_probe,
         .detach_client = saa6588_detach,
         .command = saa6588_command,
@@ -506,7 +506,6 @@ static struct i2c_driver driver = {
 
 static struct i2c_client client_template = {
         .name = "saa6588",
-        .flags = I2C_CLIENT_ALLOW_USE,
         .driver = &driver,
 };
 
diff --git a/drivers/media/video/saa7110.c b/drivers/media/video/saa7110.c
index e116bdbed310..619ff0b7a1ff 100644
--- a/drivers/media/video/saa7110.c
+++ b/drivers/media/video/saa7110.c
@@ -501,7 +501,6 @@ saa7110_detect_client (struct i2c_adapter *adapter,
         client->addr = address;
         client->adapter = adapter;
         client->driver = &i2c_driver_saa7110;
-        client->flags = I2C_CLIENT_ALLOW_USE;
         strlcpy(I2C_NAME(client), "saa7110", sizeof(I2C_NAME(client)));
 
         decoder = kmalloc(sizeof(struct saa7110), GFP_KERNEL);
@@ -587,11 +586,11 @@ saa7110_detach_client (struct i2c_client *client)
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver i2c_driver_saa7110 = {
-        .owner = THIS_MODULE,
-        .name = "saa7110",
+        .driver = {
+                .name = "saa7110",
+        },
 
         .id = I2C_DRIVERID_SAA7110,
-        .flags = I2C_DF_NOTIFY,
 
         .attach_adapter = saa7110_attach_adapter,
         .detach_client = saa7110_detach_client,
diff --git a/drivers/media/video/saa7111.c b/drivers/media/video/saa7111.c
index fe8a5e453969..acaeee592b54 100644
--- a/drivers/media/video/saa7111.c
+++ b/drivers/media/video/saa7111.c
@@ -518,7 +518,6 @@ saa7111_detect_client (struct i2c_adapter *adapter,
         client->addr = address;
         client->adapter = adapter;
         client->driver = &i2c_driver_saa7111;
-        client->flags = I2C_CLIENT_ALLOW_USE;
         strlcpy(I2C_NAME(client), "saa7111", sizeof(I2C_NAME(client)));
 
         decoder = kmalloc(sizeof(struct saa7111), GFP_KERNEL);
@@ -590,11 +589,11 @@ saa7111_detach_client (struct i2c_client *client)
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver i2c_driver_saa7111 = {
-        .owner = THIS_MODULE,
-        .name = "saa7111",
+        .driver = {
+                .name = "saa7111",
+        },
 
         .id = I2C_DRIVERID_SAA7111A,
-        .flags = I2C_DF_NOTIFY,
 
         .attach_adapter = saa7111_attach_adapter,
         .detach_client = saa7111_detach_client,
diff --git a/drivers/media/video/saa7114.c b/drivers/media/video/saa7114.c
index d9f50e2f7b92..b7ac0122f729 100644
--- a/drivers/media/video/saa7114.c
+++ b/drivers/media/video/saa7114.c
@@ -859,7 +859,6 @@ saa7114_detect_client (struct i2c_adapter *adapter,
         client->addr = address;
         client->adapter = adapter;
         client->driver = &i2c_driver_saa7114;
-        client->flags = I2C_CLIENT_ALLOW_USE;
         strlcpy(I2C_NAME(client), "saa7114", sizeof(I2C_NAME(client)));
 
         decoder = kmalloc(sizeof(struct saa7114), GFP_KERNEL);
@@ -1204,11 +1203,11 @@ saa7114_detach_client (struct i2c_client *client)
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver i2c_driver_saa7114 = {
-        .owner = THIS_MODULE,
-        .name = "saa7114",
+        .driver = {
+                .name = "saa7114",
+        },
 
         .id = I2C_DRIVERID_SAA7114,
-        .flags = I2C_DF_NOTIFY,
 
         .attach_adapter = saa7114_attach_adapter,
         .detach_client = saa7114_detach_client,
diff --git a/drivers/media/video/saa7115.c b/drivers/media/video/saa7115.c
index e717e30d8187..29e28c742cd4 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 };
@@ -1270,7 +1271,6 @@ static int saa7115_attach(struct i2c_adapter *adapter, int address, int kind)
         client->addr = address;
         client->adapter = adapter;
         client->driver = &i2c_driver_saa7115;
-        client->flags = I2C_CLIENT_ALLOW_USE;
         snprintf(client->name, sizeof(client->name) - 1, "saa7115");
 
         saa7115_dbg("detecting saa7115 client on address 0x%x\n", address << 1);
@@ -1354,13 +1354,13 @@ static int saa7115_detach(struct i2c_client *client)
 
 /* i2c implementation */
 static struct i2c_driver i2c_driver_saa7115 = {
-        .name = "saa7115",
+        .driver = {
+                .name = "saa7115",
+        },
         .id = I2C_DRIVERID_SAA711X,
-        .flags = I2C_DF_NOTIFY,
         .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 31f7b950b01c..8008537391b5 100644
--- a/drivers/media/video/saa711x.c
+++ b/drivers/media/video/saa711x.c
@@ -494,7 +494,6 @@ saa711x_detect_client (struct i2c_adapter *adapter,
         client->addr = address;
         client->adapter = adapter;
         client->driver = &i2c_driver_saa711x;
-        client->flags = I2C_CLIENT_ALLOW_USE;
         strlcpy(I2C_NAME(client), "saa711x", sizeof(I2C_NAME(client)));
         decoder = kmalloc(sizeof(struct saa711x), GFP_KERNEL);
         if (decoder == NULL) {
@@ -565,11 +564,11 @@ saa711x_detach_client (struct i2c_client *client)
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver i2c_driver_saa711x = {
-        .owner = THIS_MODULE,
-        .name = "saa711x",
+        .driver = {
+                .name = "saa711x",
+        },
 
         .id = I2C_DRIVERID_SAA711X,
-        .flags = I2C_DF_NOTIFY,
 
         .attach_adapter = saa711x_attach_adapter,
         .detach_client = saa711x_detach_client,
diff --git a/drivers/media/video/saa7127.c b/drivers/media/video/saa7127.c
index c36f014f1fdf..bca6ed0e2752 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 };
@@ -719,7 +721,6 @@ static int saa7127_attach(struct i2c_adapter *adapter, int address, int kind)
         client->addr = address;
         client->adapter = adapter;
         client->driver = &i2c_driver_saa7127;
-        client->flags = I2C_CLIENT_ALLOW_USE;
         snprintf(client->name, sizeof(client->name) - 1, "saa7127");
 
         saa7127_dbg("detecting saa7127 client on address 0x%x\n", address << 1);
@@ -819,13 +820,13 @@ static int saa7127_detach(struct i2c_client *client)
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver i2c_driver_saa7127 = {
-        .name = "saa7127",
+        .driver = {
+                .name = "saa7127",
+        },
         .id = I2C_DRIVERID_SAA7127,
-        .flags = I2C_DF_NOTIFY,
         .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 a61d24f588f7..4615a982ac64 100644
--- a/drivers/media/video/saa7134/saa6752hs.c
+++ b/drivers/media/video/saa7134/saa6752hs.c
@@ -597,10 +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 = {
+                .name   = "i2c saa6752hs MPEG encoder",
+        },
         .id             = I2C_DRIVERID_SAA6752HS,
-        .flags          = I2C_DF_NOTIFY,
         .attach_adapter = saa6752hs_probe,
         .detach_client  = saa6752hs_detach,
         .command        = saa6752hs_command,
@@ -609,7 +609,6 @@ static struct i2c_driver driver = {
 static struct i2c_client client_template =
 {
         .name       = "saa6752hs",
-        .flags      = I2C_CLIENT_ALLOW_USE,
         .driver     = &driver,
 };
 
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 132aa7943c16..f72a9f796209 100644
--- a/drivers/media/video/saa7185.c
+++ b/drivers/media/video/saa7185.c
@@ -415,7 +415,6 @@ saa7185_detect_client (struct i2c_adapter *adapter,
         client->addr = address;
         client->adapter = adapter;
         client->driver = &i2c_driver_saa7185;
-        client->flags = I2C_CLIENT_ALLOW_USE;
         strlcpy(I2C_NAME(client), "saa7185", sizeof(I2C_NAME(client)));
 
         encoder = kmalloc(sizeof(struct saa7185), GFP_KERNEL);
@@ -487,11 +486,11 @@ saa7185_detach_client (struct i2c_client *client)
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver i2c_driver_saa7185 = {
-        .owner = THIS_MODULE,
-        .name = "saa7185",      /* name */
+        .driver = {
+                .name = "saa7185",      /* name */
+        },
 
         .id = I2C_DRIVERID_SAA7185B,
-        .flags = I2C_DF_NOTIFY,
 
         .attach_adapter = saa7185_attach_adapter,
         .detach_client = saa7185_detach_client,
diff --git a/drivers/media/video/saa7191.c b/drivers/media/video/saa7191.c
index cbca896e8cfa..41f6f05a0436 100644
--- a/drivers/media/video/saa7191.c
+++ b/drivers/media/video/saa7191.c
@@ -788,10 +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 = {
+                .name   = "saa7191",
+        },
         .id             = I2C_DRIVERID_SAA7191,
-        .flags          = I2C_DF_NOTIFY,
         .attach_adapter = saa7191_probe,
         .detach_client  = saa7191_detach,
         .command        = saa7191_command
diff --git a/drivers/media/video/tda7432.c b/drivers/media/video/tda7432.c
index d32737dd2142..549c9929f107 100644
--- a/drivers/media/video/tda7432.c
+++ b/drivers/media/video/tda7432.c
@@ -501,10 +501,10 @@ static int tda7432_command(struct i2c_client *client,
 }
 
 static struct i2c_driver driver = {
-        .owner           = THIS_MODULE,
-        .name            = "i2c tda7432 driver",
+        .driver = {
+                .name    = "i2c tda7432 driver",
+        },
         .id              = I2C_DRIVERID_TDA7432,
-        .flags           = I2C_DF_NOTIFY,
         .attach_adapter  = tda7432_probe,
         .detach_client   = tda7432_detach,
         .command         = tda7432_command,
diff --git a/drivers/media/video/tda9840.c b/drivers/media/video/tda9840.c
index 0cb5c7e9a884..ed4c04119ccc 100644
--- a/drivers/media/video/tda9840.c
+++ b/drivers/media/video/tda9840.c
@@ -221,10 +221,10 @@ static int detach(struct i2c_client *client)
 }
 
 static struct i2c_driver driver = {
-        .owner  = THIS_MODULE,
-        .name   = "tda9840",
+        .driver = {
+                .name   = "tda9840",
+        },
         .id     = I2C_DRIVERID_TDA9840,
-        .flags  = I2C_DF_NOTIFY,
         .attach_adapter = attach,
         .detach_client  = detach,
         .command        = command,
diff --git a/drivers/media/video/tda9875.c b/drivers/media/video/tda9875.c
index a5e37dc91f39..9c3ecf7a0fed 100644
--- a/drivers/media/video/tda9875.c
+++ b/drivers/media/video/tda9875.c
@@ -372,10 +372,10 @@ static int tda9875_command(struct i2c_client *client,
 
 
 static struct i2c_driver driver = {
-        .owner          = THIS_MODULE,
-        .name           = "i2c tda9875 driver",
+        .driver = {
+                .name   = "i2c tda9875 driver",
+        },
         .id             = I2C_DRIVERID_TDA9875,
-        .flags          = I2C_DF_NOTIFY,
         .attach_adapter = tda9875_probe,
         .detach_client  = tda9875_detach,
         .command        = tda9875_command,
diff --git a/drivers/media/video/tda9887.c b/drivers/media/video/tda9887.c
index 2f2414e90e8b..7165a1b9625a 100644
--- a/drivers/media/video/tda9887.c
+++ b/drivers/media/video/tda9887.c
@@ -819,14 +819,12 @@ static int tda9887_resume(struct device * dev)
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver driver = {
-        .owner          = THIS_MODULE,
-        .name           = "i2c tda9887 driver",
         .id             = -1, /* FIXME */
-        .flags          = I2C_DF_NOTIFY,
         .attach_adapter = tda9887_probe,
         .detach_client  = tda9887_detach,
         .command        = tda9887_command,
         .driver = {
+                .name    = "i2c tda9887 driver",
                 .suspend = tda9887_suspend,
                 .resume  = tda9887_resume,
         },
@@ -834,7 +832,6 @@ static struct i2c_driver driver = {
 static struct i2c_client client_template =
 {
         .name      = "tda9887",
-        .flags     = I2C_CLIENT_ALLOW_USE,
         .driver    = &driver,
 };
 
diff --git a/drivers/media/video/tea6415c.c b/drivers/media/video/tea6415c.c
index 09149dad1b84..bb35844e3842 100644
--- a/drivers/media/video/tea6415c.c
+++ b/drivers/media/video/tea6415c.c
@@ -190,10 +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 = {
+                .name   = "tea6415c",
+        },
         .id     = I2C_DRIVERID_TEA6415C,
-        .flags  = I2C_DF_NOTIFY,
         .attach_adapter = attach,
         .detach_client  = detach,
         .command        = command,
diff --git a/drivers/media/video/tea6420.c b/drivers/media/video/tea6420.c
index e908f917c8d2..c4ba3742f5c7 100644
--- a/drivers/media/video/tea6420.c
+++ b/drivers/media/video/tea6420.c
@@ -167,10 +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 = {
+                .name   = "tea6420",
+        },
         .id     = I2C_DRIVERID_TEA6420,
-        .flags  = I2C_DF_NOTIFY,
         .attach_adapter = attach,
         .detach_client  = detach,
         .command        = command,
diff --git a/drivers/media/video/tuner-3036.c b/drivers/media/video/tuner-3036.c
index 79203595b9c1..d97f66804c37 100644
--- a/drivers/media/video/tuner-3036.c
+++ b/drivers/media/video/tuner-3036.c
@@ -175,10 +175,10 @@ tuner_probe(struct i2c_adapter *adap)
 static struct i2c_driver 
 i2c_driver_tuner = 
 {
-        .owner          =       THIS_MODULE,
-        .name           =       "sab3036",
+        .driver = {
+                .name   =       "sab3036",
+        },
         .id             =       I2C_DRIVERID_SAB3036,
-        .flags          =       I2C_DF_NOTIFY,
         .attach_adapter =       tuner_probe,
         .detach_client  =       tuner_detach,
         .command        =       tuner_command
diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c
index e58abdfcaab8..c13c7b95ef35 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,21 +742,18 @@ static int tuner_resume(struct device *dev)
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver driver = {
-        .owner = THIS_MODULE,
-        .name = "tuner",
         .id = I2C_DRIVERID_TUNER,
-        .flags = I2C_DF_NOTIFY,
         .attach_adapter = tuner_probe,
         .detach_client = tuner_detach,
         .command = tuner_command,
         .driver = {
+                   .name = "tuner",
                    .suspend = tuner_suspend,
                    .resume = tuner_resume,
                    },
 };
 static struct i2c_client client_template = {
         .name = "(tuner unset)",
-        .flags = I2C_CLIENT_ALLOW_USE,
         .driver = &driver,
 };
 
diff --git a/drivers/media/video/tvaudio.c b/drivers/media/video/tvaudio.c
index 5b20e8177cad..0292c5abf14a 100644
--- a/drivers/media/video/tvaudio.c
+++ b/drivers/media/video/tvaudio.c
@@ -1702,10 +1702,10 @@ static int chip_command(struct i2c_client *client,
 
 
 static struct i2c_driver driver = {
-        .owner           = THIS_MODULE,
-        .name            = "generic i2c audio driver",
+        .driver = {
+                .name    = "generic i2c audio driver",
+        },
         .id              = I2C_DRIVERID_TVAUDIO,
-        .flags           = I2C_DF_NOTIFY,
         .attach_adapter  = chip_probe,
         .detach_client   = chip_detach,
         .command         = chip_command,
@@ -1714,7 +1714,6 @@ static struct i2c_driver driver = {
 static struct i2c_client client_template =
 {
         .name       = "(unset)",
-        .flags      = I2C_CLIENT_ALLOW_USE,
         .driver     = &driver,
 };
 
diff --git a/drivers/media/video/tveeprom.c b/drivers/media/video/tveeprom.c
index 5ac235365dd8..8ac4cb82a459 100644
--- a/drivers/media/video/tveeprom.c
+++ b/drivers/media/video/tveeprom.c
@@ -751,7 +751,6 @@ tveeprom_detect_client(struct i2c_adapter *adapter,
         client->addr = address;
         client->adapter = adapter;
         client->driver = &i2c_driver_tveeprom;
-        client->flags = I2C_CLIENT_ALLOW_USE;
         snprintf(client->name, sizeof(client->name), "tveeprom");
         i2c_attach_client(client);
 
@@ -779,10 +778,10 @@ tveeprom_detach_client (struct i2c_client *client)
 }
 
 static struct i2c_driver i2c_driver_tveeprom = {
-        .owner          = THIS_MODULE,
-        .name           = "tveeprom",
+        .driver = {
+                .name   = "tveeprom",
+        },
         .id             = I2C_DRIVERID_TVEEPROM,
-        .flags          = I2C_DF_NOTIFY,
         .attach_adapter = tveeprom_attach_adapter,
         .detach_client  = tveeprom_detach_client,
         .command        = tveeprom_command,
diff --git a/drivers/media/video/tvmixer.c b/drivers/media/video/tvmixer.c
index 8318bd1aad00..e837f9f7fed6 100644
--- a/drivers/media/video/tvmixer.c
+++ b/drivers/media/video/tvmixer.c
@@ -228,16 +228,14 @@ static int tvmixer_release(struct inode *inode, struct file *file)
 
 static struct i2c_driver driver = {
 #ifdef I2C_PEC
-        .owner           = THIS_MODULE,
-#endif
+        .driver = {
+                .name    = "tv card mixer driver",
+        },
+#else
         .name            = "tv card mixer driver",
+#endif
         .id              = I2C_DRIVERID_TVMIXER,
-#ifdef I2C_DF_DUMMY
-        .flags           = I2C_DF_DUMMY,
-#else
-        .flags           = I2C_DF_NOTIFY,
         .detach_adapter  = tvmixer_adapters,
-#endif
         .attach_adapter  = tvmixer_adapters,
         .detach_client   = tvmixer_clients,
 };
diff --git a/drivers/media/video/tvp5150.c b/drivers/media/video/tvp5150.c
index 97431e26d229..a60442ea4f94 100644
--- a/drivers/media/video/tvp5150.c
+++ b/drivers/media/video/tvp5150.c
@@ -714,7 +714,6 @@ static struct i2c_driver driver;
 
 static struct i2c_client client_template = {
         .name = "(unset)",
-        .flags = I2C_CLIENT_ALLOW_USE,
         .driver = &driver,
 };
 
@@ -801,12 +800,12 @@ static int tvp5150_detach_client(struct i2c_client *client)
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver driver = {
-        .owner = THIS_MODULE,
-        .name = "tvp5150",
+        .driver = {
+                .name = "tvp5150",
+        },
 
         /* FIXME */
         .id = I2C_DRIVERID_SAA7110,
-        .flags = I2C_DF_NOTIFY,
 
         .attach_adapter = tvp5150_attach_adapter,
         .detach_client = tvp5150_detach_client,
diff --git a/drivers/media/video/vpx3220.c b/drivers/media/video/vpx3220.c
index 137b58f2c666..8dcee8b60e21 100644
--- a/drivers/media/video/vpx3220.c
+++ b/drivers/media/video/vpx3220.c
@@ -631,7 +631,6 @@ vpx3220_detect_client (struct i2c_adapter *adapter,
         client->addr = address;
         client->adapter = adapter;
         client->driver = &vpx3220_i2c_driver;
-        client->flags = I2C_CLIENT_ALLOW_USE;
 
         /* Check for manufacture ID and part number */
         if (kind < 0) {
@@ -722,11 +721,11 @@ vpx3220_attach_adapter (struct i2c_adapter *adapter)
  */
 
 static struct i2c_driver vpx3220_i2c_driver = {
-        .owner = THIS_MODULE,
-        .name = "vpx3220",
+        .driver = {
+                .name = "vpx3220",
+        },
 
         .id = I2C_DRIVERID_VPX3220,
-        .flags = I2C_DF_NOTIFY,
 
         .attach_adapter = vpx3220_attach_adapter,
         .detach_client = vpx3220_detach_client,
diff --git a/drivers/media/video/wm8775.c b/drivers/media/video/wm8775.c
index a6936ad74fcf..bbfd55cd9948 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)
 
 
@@ -168,7 +168,6 @@ static int wm8775_attach(struct i2c_adapter *adapter, int address, int kind)
         client->addr = address;
         client->adapter = adapter;
         client->driver = &i2c_driver;
-        client->flags = I2C_CLIENT_ALLOW_USE;
         snprintf(client->name, sizeof(client->name) - 1, "wm8775");
 
         wm8775_info("chip found @ 0x%x (%s)\n", address << 1, adapter->name);
@@ -233,15 +232,15 @@ static int wm8775_detach(struct i2c_client *client)
 
 /* i2c implementation */
 static struct i2c_driver i2c_driver = {
-        .name = "wm8775",
+        .driver = {
+                .name = "wm8775",
+        },
 
         .id = I2C_DRIVERID_WM8775,
-        .flags = I2C_DF_NOTIFY,
 
         .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);