[PATCH] I2C: Remove .owner setting from i2c_driver as it's no longer needed

Now that i2c_add_driver() doesn't need the module owner to be set by
hand, we can delete it from the drivers.  This patch catches all of the
drivers that I found in the current tree (if a driver sets the .owner by
hand, it's not a problem, just not needed.)

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Cc: Jean Delvare <khali@linux-fr.org>

95 files changed, 0 insertions, 98 deletions

diff --git a/arch/arm/mach-pxa/akita-ioexp.c b/arch/arm/mach-pxa/akita-ioexp.c
index 6f7b96551ada..1b398742ab56 100644
--- a/arch/arm/mach-pxa/akita-ioexp.c
+++ b/arch/arm/mach-pxa/akita-ioexp.c
@@ -125,7 +125,6 @@ static int max7310_detach_client(struct i2c_client *client)
 
 static struct i2c_driver max7310_i2c_driver = {
         .driver = {
-                .owner  = THIS_MODULE,
                 .name   = "akita-max7310",
         },
         .id             = I2C_DRIVERID_AKITAIOEXP,
diff --git a/drivers/acorn/char/pcf8583.c b/drivers/acorn/char/pcf8583.c
index 5fc5940e637c..9b49f316ae92 100644
--- a/drivers/acorn/char/pcf8583.c
+++ b/drivers/acorn/char/pcf8583.c
@@ -258,7 +258,6 @@ pcf8583_command(struct i2c_client *client, unsigned int cmd, void *arg)
 
 static struct i2c_driver pcf8583_driver = {
         .driver = {
-                .owner  = THIS_MODULE,
                 .name   = "PCF8583",
         },
         .id             = I2C_DRIVERID_PCF8583,
diff --git a/drivers/hwmon/adm1021.c b/drivers/hwmon/adm1021.c
index 679cb92ccaf4..665612729cb9 100644
--- a/drivers/hwmon/adm1021.c
+++ b/drivers/hwmon/adm1021.c
@@ -127,7 +127,6 @@ static int read_only;
 /* This is the driver that will be inserted */
 static struct i2c_driver adm1021_driver = {
         .driver = {
-                .owner  = THIS_MODULE,
                 .name   = "adm1021",
         },
         .id             = I2C_DRIVERID_ADM1021,
diff --git a/drivers/hwmon/adm1025.c b/drivers/hwmon/adm1025.c
index 3c70622c8cb1..9331c56d2ba6 100644
--- a/drivers/hwmon/adm1025.c
+++ b/drivers/hwmon/adm1025.c
@@ -119,7 +119,6 @@ static struct adm1025_data *adm1025_update_device(struct device *dev);
 
 static struct i2c_driver adm1025_driver = {
         .driver = {
-                .owner  = THIS_MODULE,
                 .name   = "adm1025",
         },
         .id             = I2C_DRIVERID_ADM1025,
diff --git a/drivers/hwmon/adm1026.c b/drivers/hwmon/adm1026.c
index 92fac344d05b..fefe6e74fd02 100644
--- a/drivers/hwmon/adm1026.c
+++ b/drivers/hwmon/adm1026.c
@@ -309,7 +309,6 @@ static void adm1026_init_client(struct i2c_client *client);
 
 static struct i2c_driver adm1026_driver = {
         .driver = {
-                .owner  = THIS_MODULE,
                 .name   = "adm1026",
         },
         .attach_adapter = adm1026_attach_adapter,
diff --git a/drivers/hwmon/adm1031.c b/drivers/hwmon/adm1031.c
index e42d75e28804..d06397966081 100644
--- a/drivers/hwmon/adm1031.c
+++ b/drivers/hwmon/adm1031.c
@@ -106,7 +106,6 @@ static struct adm1031_data *adm1031_update_device(struct device *dev);
 /* This is the driver that will be inserted */
 static struct i2c_driver adm1031_driver = {
         .driver = {
-                .owner = THIS_MODULE,
                 .name = "adm1031",
         },
         .attach_adapter = adm1031_attach_adapter,
diff --git a/drivers/hwmon/adm9240.c b/drivers/hwmon/adm9240.c
index e60309e9726c..5ddc22fea4a3 100644
--- a/drivers/hwmon/adm9240.c
+++ b/drivers/hwmon/adm9240.c
@@ -138,7 +138,6 @@ static struct adm9240_data *adm9240_update_device(struct device *dev);
 /* driver data */
 static struct i2c_driver adm9240_driver = {
         .driver = {
-                .owner  = THIS_MODULE,
                 .name   = "adm9240",
         },
         .id             = I2C_DRIVERID_ADM9240,
diff --git a/drivers/hwmon/asb100.c b/drivers/hwmon/asb100.c
index 3068de0dc728..ae9de63cf2e0 100644
--- a/drivers/hwmon/asb100.c
+++ b/drivers/hwmon/asb100.c
@@ -218,7 +218,6 @@ static void asb100_init_client(struct i2c_client *client);
 
 static struct i2c_driver asb100_driver = {
         .driver = {
-                .owner  = THIS_MODULE,
                 .name   = "asb100",
         },
         .id             = I2C_DRIVERID_ASB100,
diff --git a/drivers/hwmon/atxp1.c b/drivers/hwmon/atxp1.c
index ed152d939643..b0c490073c8e 100644
--- a/drivers/hwmon/atxp1.c
+++ b/drivers/hwmon/atxp1.c
@@ -51,7 +51,6 @@ static int atxp1_detect(struct i2c_adapter *adapter, int address, int kind);
 
 static struct i2c_driver atxp1_driver = {
         .driver = {
-                .owner  = THIS_MODULE,
                 .name   = "atxp1",
         },
         .attach_adapter = atxp1_attach_adapter,
diff --git a/drivers/hwmon/ds1621.c b/drivers/hwmon/ds1621.c
index 860094005c14..203f9c7abb20 100644
--- a/drivers/hwmon/ds1621.c
+++ b/drivers/hwmon/ds1621.c
@@ -90,7 +90,6 @@ static struct ds1621_data *ds1621_update_client(struct device *dev);
 /* This is the driver that will be inserted */
 static struct i2c_driver ds1621_driver = {
         .driver = {
-                .owner  = THIS_MODULE,
                 .name   = "ds1621",
         },
         .id             = I2C_DRIVERID_DS1621,
diff --git a/drivers/hwmon/fscher.c b/drivers/hwmon/fscher.c
index 982fff42ce94..25409181d1eb 100644
--- a/drivers/hwmon/fscher.c
+++ b/drivers/hwmon/fscher.c
@@ -119,7 +119,6 @@ static int fscher_write_value(struct i2c_client *client, u8 reg, u8 value);
  
 static struct i2c_driver fscher_driver = {
         .driver = {
-                .owner  = THIS_MODULE,
                 .name   = "fscher",
         },
         .id             = I2C_DRIVERID_FSCHER,
diff --git a/drivers/hwmon/fscpos.c b/drivers/hwmon/fscpos.c
index 971146b92cc0..6d0146b57020 100644
--- a/drivers/hwmon/fscpos.c
+++ b/drivers/hwmon/fscpos.c
@@ -101,7 +101,6 @@ static void reset_fan_alarm(struct i2c_client *client, int nr);
  */
 static struct i2c_driver fscpos_driver = {
         .driver = {
-                .owner  = THIS_MODULE,
                 .name   = "fscpos",
         },
         .id             = I2C_DRIVERID_FSCPOS,
diff --git a/drivers/hwmon/gl518sm.c b/drivers/hwmon/gl518sm.c
index 9c5ca1f467a9..9e685e3a3bc9 100644
--- a/drivers/hwmon/gl518sm.c
+++ b/drivers/hwmon/gl518sm.c
@@ -152,7 +152,6 @@ static struct gl518_data *gl518_update_device(struct device *dev);
 /* This is the driver that will be inserted */
 static struct i2c_driver gl518_driver = {
         .driver = {
-                .owner  = THIS_MODULE,
                 .name   = "gl518sm",
         },
         .id             = I2C_DRIVERID_GL518,
diff --git a/drivers/hwmon/gl520sm.c b/drivers/hwmon/gl520sm.c
index a9a724a6f38a..baee60e44b52 100644
--- a/drivers/hwmon/gl520sm.c
+++ b/drivers/hwmon/gl520sm.c
@@ -110,7 +110,6 @@ static struct gl520_data *gl520_update_device(struct device *dev);
 /* Driver data */
 static struct i2c_driver gl520_driver = {
         .driver = {
-                .owner  = THIS_MODULE,
                 .name   = "gl520sm",
         },
         .id             = I2C_DRIVERID_GL520,
diff --git a/drivers/hwmon/it87.c b/drivers/hwmon/it87.c
index 24d520bcc0b6..29b74a880eae 100644
--- a/drivers/hwmon/it87.c
+++ b/drivers/hwmon/it87.c
@@ -235,7 +235,6 @@ static void it87_init_client(struct i2c_client *client, struct it87_data *data);
 
 static struct i2c_driver it87_driver = {
         .driver = {
-                .owner  = THIS_MODULE,
                 .name   = "it87",
         },
         .id             = I2C_DRIVERID_IT87,
@@ -245,7 +244,6 @@ static struct i2c_driver it87_driver = {
 
 static struct i2c_driver it87_isa_driver = {
         .driver = {
-                .owner  = THIS_MODULE,
                 .name   = "it87-isa",
         },
         .attach_adapter = it87_isa_attach_adapter,
diff --git a/drivers/hwmon/lm63.c b/drivers/hwmon/lm63.c
index 35baae742cff..6b1aa7ef552e 100644
--- a/drivers/hwmon/lm63.c
+++ b/drivers/hwmon/lm63.c
@@ -140,7 +140,6 @@ static void lm63_init_client(struct i2c_client *client);
 
 static struct i2c_driver lm63_driver = {
         .driver = {
-                .owner  = THIS_MODULE,
                 .name   = "lm63",
         },
         .attach_adapter = lm63_attach_adapter,
diff --git a/drivers/hwmon/lm75.c b/drivers/hwmon/lm75.c
index db35fbf4d250..74ca2c8c61c3 100644
--- a/drivers/hwmon/lm75.c
+++ b/drivers/hwmon/lm75.c
@@ -67,7 +67,6 @@ static struct lm75_data *lm75_update_device(struct device *dev);
 /* This is the driver that will be inserted */
 static struct i2c_driver lm75_driver = {
         .driver = {
-                .owner  = THIS_MODULE,
                 .name   = "lm75",
         },
         .id             = I2C_DRIVERID_LM75,
diff --git a/drivers/hwmon/lm77.c b/drivers/hwmon/lm77.c
index 177072056d7d..a2f420d01fb7 100644
--- a/drivers/hwmon/lm77.c
+++ b/drivers/hwmon/lm77.c
@@ -75,7 +75,6 @@ static struct lm77_data *lm77_update_device(struct device *dev);
 /* This is the driver that will be inserted */
 static struct i2c_driver lm77_driver = {
         .driver = {
-                .owner  = THIS_MODULE,
                 .name   = "lm77",
         },
         .attach_adapter = lm77_attach_adapter,
diff --git a/drivers/hwmon/lm78.c b/drivers/hwmon/lm78.c
index 3af5b06995e0..e404001e20da 100644
--- a/drivers/hwmon/lm78.c
+++ b/drivers/hwmon/lm78.c
@@ -165,7 +165,6 @@ static void lm78_init_client(struct i2c_client *client);
 
 static struct i2c_driver lm78_driver = {
         .driver = {
-                .owner  = THIS_MODULE,
                 .name   = "lm78",
         },
         .id             = I2C_DRIVERID_LM78,
@@ -175,7 +174,6 @@ static struct i2c_driver lm78_driver = {
 
 static struct i2c_driver lm78_isa_driver = {
         .driver = {
-                .owner  = THIS_MODULE,
                 .name   = "lm78-isa",
         },
         .attach_adapter = lm78_isa_attach_adapter,
diff --git a/drivers/hwmon/lm80.c b/drivers/hwmon/lm80.c
index 1dc118f411a7..c9a7cdea7bd7 100644
--- a/drivers/hwmon/lm80.c
+++ b/drivers/hwmon/lm80.c
@@ -144,7 +144,6 @@ static int lm80_write_value(struct i2c_client *client, u8 reg, u8 value);
 
 static struct i2c_driver lm80_driver = {
         .driver = {
-                .owner  = THIS_MODULE,
                 .name   = "lm80",
         },
         .id             = I2C_DRIVERID_LM80,
diff --git a/drivers/hwmon/lm83.c b/drivers/hwmon/lm83.c
index 1c1744f699fb..26dfa9e216c2 100644
--- a/drivers/hwmon/lm83.c
+++ b/drivers/hwmon/lm83.c
@@ -125,7 +125,6 @@ static struct lm83_data *lm83_update_device(struct device *dev);
  
 static struct i2c_driver lm83_driver = {
         .driver = {
-                .owner  = THIS_MODULE,
                 .name   = "lm83",
         },
         .id             = I2C_DRIVERID_LM83,
diff --git a/drivers/hwmon/lm85.c b/drivers/hwmon/lm85.c
index b537c18c7a12..7389a0127547 100644
--- a/drivers/hwmon/lm85.c
+++ b/drivers/hwmon/lm85.c
@@ -381,7 +381,6 @@ static void lm85_init_client(struct i2c_client *client);
 
 static struct i2c_driver lm85_driver = {
         .driver = {
-                .owner  = THIS_MODULE,
                 .name   = "lm85",
         },
         .id             = I2C_DRIVERID_LM85,
diff --git a/drivers/hwmon/lm87.c b/drivers/hwmon/lm87.c
index 3152c006ce06..6ba34c302d8d 100644
--- a/drivers/hwmon/lm87.c
+++ b/drivers/hwmon/lm87.c
@@ -162,7 +162,6 @@ static struct lm87_data *lm87_update_device(struct device *dev);
 
 static struct i2c_driver lm87_driver = {
         .driver = {
-                .owner  = THIS_MODULE,
                 .name   = "lm87",
         },
         .id             = I2C_DRIVERID_LM87,
diff --git a/drivers/hwmon/lm90.c b/drivers/hwmon/lm90.c
index ff7ba1e1bcc7..5679464447cc 100644
--- a/drivers/hwmon/lm90.c
+++ b/drivers/hwmon/lm90.c
@@ -187,7 +187,6 @@ static struct lm90_data *lm90_update_device(struct device *dev);
 
 static struct i2c_driver lm90_driver = {
         .driver = {
-                .owner  = THIS_MODULE,
                 .name   = "lm90",
         },
         .id             = I2C_DRIVERID_LM90,
diff --git a/drivers/hwmon/lm92.c b/drivers/hwmon/lm92.c
index b4e4a8409d01..b0c4cb730a7e 100644
--- a/drivers/hwmon/lm92.c
+++ b/drivers/hwmon/lm92.c
@@ -411,7 +411,6 @@ static int lm92_detach_client(struct i2c_client *client)
 
 static struct i2c_driver lm92_driver = {
         .driver = {
-                .owner  = THIS_MODULE,
                 .name   = "lm92",
         },
         .id             = I2C_DRIVERID_LM92,
diff --git a/drivers/hwmon/max1619.c b/drivers/hwmon/max1619.c
index 1a50b13a62ae..3abe330b22ce 100644
--- a/drivers/hwmon/max1619.c
+++ b/drivers/hwmon/max1619.c
@@ -91,7 +91,6 @@ static struct max1619_data *max1619_update_device(struct device *dev);
 
 static struct i2c_driver max1619_driver = {
         .driver = {
-                .owner  = THIS_MODULE,
                 .name   = "max1619",
         },
         .attach_adapter = max1619_attach_adapter,
diff --git a/drivers/hwmon/pc87360.c b/drivers/hwmon/pc87360.c
index 5469489c758a..f161e88e3bb6 100644
--- a/drivers/hwmon/pc87360.c
+++ b/drivers/hwmon/pc87360.c
@@ -237,7 +237,6 @@ static struct pc87360_data *pc87360_update_device(struct device *dev);
 
 static struct i2c_driver pc87360_driver = {
         .driver = {
-                .owner  = THIS_MODULE,
                 .name   = "pc87360",
         },
         .attach_adapter = pc87360_detect,
diff --git a/drivers/hwmon/sis5595.c b/drivers/hwmon/sis5595.c
index 9f44b93f3261..8be5189d9bd9 100644
--- a/drivers/hwmon/sis5595.c
+++ b/drivers/hwmon/sis5595.c
@@ -199,7 +199,6 @@ static void sis5595_init_client(struct i2c_client *client);
 
 static struct i2c_driver sis5595_driver = {
         .driver = {
-                .owner  = THIS_MODULE,
                 .name   = "sis5595",
         },
         .attach_adapter = sis5595_detect,
diff --git a/drivers/hwmon/smsc47b397.c b/drivers/hwmon/smsc47b397.c
index 02e5d55a2e2d..8663bbbe97f5 100644
--- a/drivers/hwmon/smsc47b397.c
+++ b/drivers/hwmon/smsc47b397.c
@@ -227,7 +227,6 @@ static int smsc47b397_detect(struct i2c_adapter *adapter);
 
 static struct i2c_driver smsc47b397_driver = {
         .driver = {
-                .owner  = THIS_MODULE,
                 .name   = "smsc47b397",
         },
         .attach_adapter = smsc47b397_detect,
diff --git a/drivers/hwmon/smsc47m1.c b/drivers/hwmon/smsc47m1.c
index b3051ad7b926..d1e3ec0fe4df 100644
--- a/drivers/hwmon/smsc47m1.c
+++ b/drivers/hwmon/smsc47m1.c
@@ -127,7 +127,6 @@ static struct smsc47m1_data *smsc47m1_update_device(struct device *dev,
 
 static struct i2c_driver smsc47m1_driver = {
         .driver = {
-                .owner  = THIS_MODULE,
                 .name   = "smsc47m1",
         },
         .attach_adapter = smsc47m1_detect,
diff --git a/drivers/hwmon/via686a.c b/drivers/hwmon/via686a.c
index db75fbccfb62..cb01848729b5 100644
--- a/drivers/hwmon/via686a.c
+++ b/drivers/hwmon/via686a.c
@@ -573,7 +573,6 @@ static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
    smbus_driver and isa_driver, and clients could be of either kind */
 static struct i2c_driver via686a_driver = {
         .driver = {
-                .owner  = THIS_MODULE,
                 .name   = "via686a",
         },
         .attach_adapter = via686a_detect,
diff --git a/drivers/hwmon/vt8231.c b/drivers/hwmon/vt8231.c
index c2eb54b52073..d00a726d0239 100644
--- a/drivers/hwmon/vt8231.c
+++ b/drivers/hwmon/vt8231.c
@@ -586,7 +586,6 @@ static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
 
 static struct i2c_driver vt8231_driver = {
         .driver = {
-                .owner  = THIS_MODULE,
                 .name   = "vt8231",
         },
         .attach_adapter = vt8231_detect,
diff --git a/drivers/hwmon/w83627ehf.c b/drivers/hwmon/w83627ehf.c
index 94538fb3ef1f..12d79f5e4900 100644
--- a/drivers/hwmon/w83627ehf.c
+++ b/drivers/hwmon/w83627ehf.c
@@ -786,7 +786,6 @@ static int w83627ehf_detach_client(struct i2c_client *client)
 
 static struct i2c_driver w83627ehf_driver = {
         .driver = {
-                .owner  = THIS_MODULE,
                 .name   = "w83627ehf",
         },
         .attach_adapter = w83627ehf_detect,
diff --git a/drivers/hwmon/w83627hf.c b/drivers/hwmon/w83627hf.c
index 2ffb84f9c6b7..7ea441d4da63 100644
--- a/drivers/hwmon/w83627hf.c
+++ b/drivers/hwmon/w83627hf.c
@@ -333,7 +333,6 @@ static void w83627hf_init_client(struct i2c_client *client);
 
 static struct i2c_driver w83627hf_driver = {
         .driver = {
-                .owner  = THIS_MODULE,
                 .name   = "w83627hf",
         },
         .attach_adapter = w83627hf_detect,
diff --git a/drivers/hwmon/w83781d.c b/drivers/hwmon/w83781d.c
index fd1a59c53630..557114872f3c 100644
--- a/drivers/hwmon/w83781d.c
+++ b/drivers/hwmon/w83781d.c
@@ -270,7 +270,6 @@ static void w83781d_init_client(struct i2c_client *client);
 
 static struct i2c_driver w83781d_driver = {
         .driver = {
-                .owner = THIS_MODULE,
                 .name = "w83781d",
         },
         .id = I2C_DRIVERID_W83781D,
@@ -280,7 +279,6 @@ static struct i2c_driver w83781d_driver = {
 
 static struct i2c_driver w83781d_isa_driver = {
         .driver = {
-                .owner = THIS_MODULE,
                 .name = "w83781d-isa",
         },
         .attach_adapter = w83781d_isa_attach_adapter,
diff --git a/drivers/hwmon/w83792d.c b/drivers/hwmon/w83792d.c
index 9018445ac1bf..ff1c9f0abf93 100644
--- a/drivers/hwmon/w83792d.c
+++ b/drivers/hwmon/w83792d.c
@@ -318,7 +318,6 @@ static void w83792d_init_client(struct i2c_client *client);
 
 static struct i2c_driver w83792d_driver = {
         .driver = {
-                .owner = THIS_MODULE,
                 .name = "w83792d",
         },
         .attach_adapter = w83792d_attach_adapter,
diff --git a/drivers/hwmon/w83l785ts.c b/drivers/hwmon/w83l785ts.c
index fc9f202f2967..f66c0cfdeda7 100644
--- a/drivers/hwmon/w83l785ts.c
+++ b/drivers/hwmon/w83l785ts.c
@@ -93,7 +93,6 @@ static struct w83l785ts_data *w83l785ts_update_device(struct device *dev);
  
 static struct i2c_driver w83l785ts_driver = {
         .driver = {
-                .owner  = THIS_MODULE,
                 .name   = "w83l785ts",
         },
         .id             = I2C_DRIVERID_W83L785TS,
diff --git a/drivers/i2c/chips/ds1337.c b/drivers/i2c/chips/ds1337.c
index a9d4ac770e39..93d483b8b770 100644
--- a/drivers/i2c/chips/ds1337.c
+++ b/drivers/i2c/chips/ds1337.c
@@ -53,7 +53,6 @@ static int ds1337_command(struct i2c_client *client, unsigned int cmd,
  */
 static struct i2c_driver ds1337_driver = {
         .driver = {
-                .owner  = THIS_MODULE,
                 .name   = "ds1337",
         },
         .attach_adapter = ds1337_attach_adapter,
diff --git a/drivers/i2c/chips/ds1374.c b/drivers/i2c/chips/ds1374.c
index 3e3ebd82a423..0710b9da9d54 100644
--- a/drivers/i2c/chips/ds1374.c
+++ b/drivers/i2c/chips/ds1374.c
@@ -233,7 +233,6 @@ static int ds1374_detach(struct i2c_client *client)
 
 static struct i2c_driver ds1374_driver = {
         .driver = {
-                .owner  = THIS_MODULE,
                 .name   = DS1374_DRV_NAME,
         },
         .id = I2C_DRIVERID_DS1374,
diff --git a/drivers/i2c/chips/eeprom.c b/drivers/i2c/chips/eeprom.c
index d0c9f291500b..41116b7947f6 100644
--- a/drivers/i2c/chips/eeprom.c
+++ b/drivers/i2c/chips/eeprom.c
@@ -69,7 +69,6 @@ static int eeprom_detach_client(struct i2c_client *client);
 /* This is the driver that will be inserted */
 static struct i2c_driver eeprom_driver = {
         .driver = {
-                .owner  = THIS_MODULE,
                 .name   = "eeprom",
         },
         .id             = I2C_DRIVERID_EEPROM,
diff --git a/drivers/i2c/chips/isp1301_omap.c b/drivers/i2c/chips/isp1301_omap.c
index 9f1ec03e698d..1251c7fc18d5 100644
--- a/drivers/i2c/chips/isp1301_omap.c
+++ b/drivers/i2c/chips/isp1301_omap.c
@@ -1633,7 +1633,6 @@ static int isp1301_scan_bus(struct i2c_adapter *bus)
 
 static struct i2c_driver isp1301_driver = {
         .driver = {
-                .owner  = THIS_MODULE,
                 .name   = "isp1301_omap",
         },
         .id             = 1301,         /* FIXME "official", i2c-ids.h */
diff --git a/drivers/i2c/chips/m41t00.c b/drivers/i2c/chips/m41t00.c
index 92759b26fdcf..2dc3d48375fc 100644
--- a/drivers/i2c/chips/m41t00.c
+++ b/drivers/i2c/chips/m41t00.c
@@ -212,7 +212,6 @@ m41t00_detach(struct i2c_client *client)
 
 static struct i2c_driver m41t00_driver = {
         .driver = {
-                .owner  = THIS_MODULE,
                 .name   = M41T00_DRV_NAME,
         },
         .id             = I2C_DRIVERID_STM41T00,
diff --git a/drivers/i2c/chips/max6875.c b/drivers/i2c/chips/max6875.c
index 37051173d233..6d3ff584155e 100644
--- a/drivers/i2c/chips/max6875.c
+++ b/drivers/i2c/chips/max6875.c
@@ -68,7 +68,6 @@ static int max6875_detach_client(struct i2c_client *client);
 /* This is the driver that will be inserted */
 static struct i2c_driver max6875_driver = {
         .driver = {
-                .owner  = THIS_MODULE,
                 .name   = "max6875",
         },
         .attach_adapter = max6875_attach_adapter,
diff --git a/drivers/i2c/chips/pca9539.c b/drivers/i2c/chips/pca9539.c
index bb57faa6d5c1..54b6e6a4beed 100644
--- a/drivers/i2c/chips/pca9539.c
+++ b/drivers/i2c/chips/pca9539.c
@@ -39,7 +39,6 @@ static int pca9539_detach_client(struct i2c_client *client);
 /* This is the driver that will be inserted */
 static struct i2c_driver pca9539_driver = {
         .driver = {
-                .owner  = THIS_MODULE,
                 .name   = "pca9539",
         },
         .attach_adapter = pca9539_attach_adapter,
diff --git a/drivers/i2c/chips/pcf8574.c b/drivers/i2c/chips/pcf8574.c
index 3d4d4d61876b..c3e6449c4481 100644
--- a/drivers/i2c/chips/pcf8574.c
+++ b/drivers/i2c/chips/pcf8574.c
@@ -66,7 +66,6 @@ static void pcf8574_init_client(struct i2c_client *client);
 /* This is the driver that will be inserted */
 static struct i2c_driver pcf8574_driver = {
         .driver = {
-                .owner  = THIS_MODULE,
                 .name   = "pcf8574",
         },
         .id             = I2C_DRIVERID_PCF8574,
diff --git a/drivers/i2c/chips/pcf8591.c b/drivers/i2c/chips/pcf8591.c
index 8f41bb3a771c..36cff09c678d 100644
--- a/drivers/i2c/chips/pcf8591.c
+++ b/drivers/i2c/chips/pcf8591.c
@@ -89,7 +89,6 @@ static int pcf8591_read_channel(struct device *dev, int channel);
 /* This is the driver that will be inserted */
 static struct i2c_driver pcf8591_driver = {
         .driver = {
-                .owner  = THIS_MODULE,
                 .name   = "pcf8591",
         },
         .id             = I2C_DRIVERID_PCF8591,
diff --git a/drivers/i2c/chips/rtc8564.c b/drivers/i2c/chips/rtc8564.c
index 6f567e2ee073..ceaa6b0bdfd6 100644
--- a/drivers/i2c/chips/rtc8564.c
+++ b/drivers/i2c/chips/rtc8564.c
@@ -359,7 +359,6 @@ rtc8564_command(struct i2c_client *client, unsigned int cmd, void *arg)
 
 static struct i2c_driver rtc8564_driver = {
         .driver = {
-                .owner  = THIS_MODULE,
                 .name   = "RTC8564",
         },
         .id             = I2C_DRIVERID_RTC8564,
diff --git a/drivers/i2c/chips/tps65010.c b/drivers/i2c/chips/tps65010.c
index 92947a6c7f1f..e70b3db69edd 100644
--- a/drivers/i2c/chips/tps65010.c
+++ b/drivers/i2c/chips/tps65010.c
@@ -638,7 +638,6 @@ static int __init tps65010_scan_bus(struct i2c_adapter *bus)
 
 static struct i2c_driver tps65010_driver = {
         .driver = {
-                .owner  = THIS_MODULE,
                 .name   = "tps65010",
         },
         .attach_adapter = tps65010_scan_bus,
diff --git a/drivers/i2c/chips/x1205.c b/drivers/i2c/chips/x1205.c
index 6880eabf1380..245fffa92dbd 100644
--- a/drivers/i2c/chips/x1205.c
+++ b/drivers/i2c/chips/x1205.c
@@ -106,7 +106,6 @@ static int x1205_command(struct i2c_client *client, unsigned int cmd,
 
 static struct i2c_driver x1205_driver = {
         .driver = {
-                .owner  = THIS_MODULE,
                 .name   = "x1205",
         },
         .attach_adapter = &x1205_attach,
diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c
index 9715217a0343..e140dd7d6a0c 100644
--- a/drivers/i2c/i2c-dev.c
+++ b/drivers/i2c/i2c-dev.c
@@ -482,7 +482,6 @@ static int i2cdev_command(struct i2c_client *client, unsigned int cmd,
 
 static struct i2c_driver i2cdev_driver = {
         .driver = {
-                .owner  = THIS_MODULE,
                 .name   = "dev_driver",
         },
         .id             = I2C_DRIVERID_I2CDEV,
diff --git a/drivers/macintosh/therm_adt746x.c b/drivers/macintosh/therm_adt746x.c
index 8bb1d857e14d..02a3117ef92d 100644
--- a/drivers/macintosh/therm_adt746x.c
+++ b/drivers/macintosh/therm_adt746x.c
@@ -172,7 +172,6 @@ detach_thermostat(struct i2c_adapter *adapter)
 
 static struct i2c_driver thermostat_driver = {  
         .driver = {
-                .owner  = THIS_MODULE,
                 .name   = "therm_adt746x",
         },
         .attach_adapter = attach_thermostat,
diff --git a/drivers/macintosh/therm_pm72.c b/drivers/macintosh/therm_pm72.c
index 97807be6422b..cf72b782f60f 100644
--- a/drivers/macintosh/therm_pm72.c
+++ b/drivers/macintosh/therm_pm72.c
@@ -284,7 +284,6 @@ static int therm_pm72_detach(struct i2c_adapter *adapter);
 static struct i2c_driver therm_pm72_driver =
 {
         .driver = {
-                .owner  = THIS_MODULE,
                 .name   = "therm_pm72",
         },
         .attach_adapter = therm_pm72_attach,
diff --git a/drivers/macintosh/therm_windtunnel.c b/drivers/macintosh/therm_windtunnel.c
index 259f19d5816c..3d9dd2e166aa 100644
--- a/drivers/macintosh/therm_windtunnel.c
+++ b/drivers/macintosh/therm_windtunnel.c
@@ -355,7 +355,6 @@ do_detach( struct i2c_client *client )
 
 static struct i2c_driver g4fan_driver = {  
         .driver = {
-                .owner  = THIS_MODULE,
                 .name   = "therm_windtunnel",
         },
         .id             = I2C_DRIVERID_G4FAN,
diff --git a/drivers/macintosh/windfarm_lm75_sensor.c b/drivers/macintosh/windfarm_lm75_sensor.c
index 555d0e4eda1d..fd16642d98ab 100644
--- a/drivers/macintosh/windfarm_lm75_sensor.c
+++ b/drivers/macintosh/windfarm_lm75_sensor.c
@@ -48,7 +48,6 @@ static int wf_lm75_detach(struct i2c_client *client);
 
 static struct i2c_driver wf_lm75_driver = {
         .driver = {
-                .owner  = THIS_MODULE,
                 .name   = "wf_lm75",
         },
         .attach_adapter = wf_lm75_attach,
diff --git a/drivers/media/video/adv7170.c b/drivers/media/video/adv7170.c
index c5f1c6b681bd..e61003de1d5f 100644
--- a/drivers/media/video/adv7170.c
+++ b/drivers/media/video/adv7170.c
@@ -498,7 +498,6 @@ adv7170_detach_client (struct i2c_client *client)
 
 static struct i2c_driver i2c_driver_adv7170 = {
         .driver = {
-                .owner = THIS_MODULE,
                 .name = "adv7170",      /* name */
         },
 
diff --git a/drivers/media/video/adv7175.c b/drivers/media/video/adv7175.c
index 33158aa734d3..6d9536a71ee4 100644
--- a/drivers/media/video/adv7175.c
+++ b/drivers/media/video/adv7175.c
@@ -548,7 +548,6 @@ adv7175_detach_client (struct i2c_client *client)
 
 static struct i2c_driver i2c_driver_adv7175 = {
         .driver = {
-                .owner = THIS_MODULE,
                 .name = "adv7175",      /* name */
         },
 
diff --git a/drivers/media/video/bt819.c b/drivers/media/video/bt819.c
index 5868bbb73a09..560b99891753 100644
--- a/drivers/media/video/bt819.c
+++ b/drivers/media/video/bt819.c
@@ -623,7 +623,6 @@ bt819_detach_client (struct i2c_client *client)
 
 static struct i2c_driver i2c_driver_bt819 = {
         .driver = {
-                .owner = THIS_MODULE,
                 .name = "bt819",
         },
 
diff --git a/drivers/media/video/bt832.c b/drivers/media/video/bt832.c
index 347eb711fc06..1c3ff5f38a6d 100644
--- a/drivers/media/video/bt832.c
+++ b/drivers/media/video/bt832.c
@@ -231,7 +231,6 @@ bt832_command(struct i2c_client *client, unsigned int cmd, void *arg)
 
 static struct i2c_driver driver = {
         .driver = {
-                .owner  = THIS_MODULE,
                 .name   = "i2c bt832 driver",
         },
         .id             = -1, /* FIXME */
diff --git a/drivers/media/video/bt856.c b/drivers/media/video/bt856.c
index 207525aa156e..60508069bbed 100644
--- a/drivers/media/video/bt856.c
+++ b/drivers/media/video/bt856.c
@@ -405,7 +405,6 @@ bt856_detach_client (struct i2c_client *client)
 
 static struct i2c_driver i2c_driver_bt856 = {
         .driver = {
-                .owner = THIS_MODULE,
                 .name = "bt856",
         },
 
diff --git a/drivers/media/video/cs53l32a.c b/drivers/media/video/cs53l32a.c
index 60484f936489..643ead1a87ee 100644
--- a/drivers/media/video/cs53l32a.c
+++ b/drivers/media/video/cs53l32a.c
@@ -217,7 +217,6 @@ static int cs53l32a_detach(struct i2c_client *client)
 /* i2c implementation */
 static struct i2c_driver i2c_driver = {
         .driver = {
-                .owner = THIS_MODULE,
                 .name = "cs53l32a",
         },
         .id = I2C_DRIVERID_CS53L32A,
diff --git a/drivers/media/video/cx25840/cx25840-core.c b/drivers/media/video/cx25840/cx25840-core.c
index 830d5195d1c0..3b09f46dddf6 100644
--- a/drivers/media/video/cx25840/cx25840-core.c
+++ b/drivers/media/video/cx25840/cx25840-core.c
@@ -844,7 +844,6 @@ static int cx25840_detach_client(struct i2c_client *client)
 
 static struct i2c_driver i2c_driver_cx25840 = {
         .driver = {
-                .owner = THIS_MODULE,
                 .name = "cx25840",
         },
 
diff --git a/drivers/media/video/indycam.c b/drivers/media/video/indycam.c
index 96a808e8b2ca..bb5cbecffcc3 100644
--- a/drivers/media/video/indycam.c
+++ b/drivers/media/video/indycam.c
@@ -452,7 +452,6 @@ static int indycam_command(struct i2c_client *client, unsigned int cmd,
 
 static struct i2c_driver i2c_driver_indycam = {
         .driver = {
-                .owner  = THIS_MODULE,
                 .name   = "indycam",
         },
         .id             = I2C_DRIVERID_INDYCAM,
diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c
index 82c7f5042659..3cc1d6a6019b 100644
--- a/drivers/media/video/ir-kbd-i2c.c
+++ b/drivers/media/video/ir-kbd-i2c.c
@@ -279,7 +279,6 @@ static int ir_probe(struct i2c_adapter *adap);
 
 static struct i2c_driver driver = {
         .driver = {
-                .owner  = THIS_MODULE,
                 .name   = "ir remote kbd driver",
         },
         .id             = I2C_DRIVERID_INFRARED,
diff --git a/drivers/media/video/msp3400.c b/drivers/media/video/msp3400.c
index 3847d890d632..183253e2dd91 100644
--- a/drivers/media/video/msp3400.c
+++ b/drivers/media/video/msp3400.c
@@ -1569,7 +1569,6 @@ static struct i2c_driver driver = {
         .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 9ac398b2d915..428f1bb75ec3 100644
--- a/drivers/media/video/ovcamchip/ovcamchip_core.c
+++ b/drivers/media/video/ovcamchip/ovcamchip_core.c
@@ -411,7 +411,6 @@ static int ovcamchip_command(struct i2c_client *c, unsigned int cmd, void *arg)
 
 static struct i2c_driver driver = {
         .driver = {
-                .owner =        THIS_MODULE,
                 .name =         "ovcamchip",
         },
         .id =                   I2C_DRIVERID_OVCAMCHIP,
diff --git a/drivers/media/video/saa5246a.c b/drivers/media/video/saa5246a.c
index 8c99edbe1843..135c21479fc0 100644
--- a/drivers/media/video/saa5246a.c
+++ b/drivers/media/video/saa5246a.c
@@ -164,7 +164,6 @@ static int saa5246a_command(struct i2c_client *device, unsigned int cmd,
 static struct i2c_driver i2c_driver_videotext =
 {
         .driver = {
-                .owner  = THIS_MODULE,
                 .name   = IF_NAME,              /* name */
         },
         .id             = I2C_DRIVERID_SAA5249, /* in i2c.h */
diff --git a/drivers/media/video/saa5249.c b/drivers/media/video/saa5249.c
index 5b346bdb1d59..d7c4e330cadd 100644
--- a/drivers/media/video/saa5249.c
+++ b/drivers/media/video/saa5249.c
@@ -237,7 +237,6 @@ static int saa5249_command(struct i2c_client *device,
 static struct i2c_driver i2c_driver_videotext = 
 {
         .driver = {
-                .owner  = THIS_MODULE,
                 .name   = IF_NAME,              /* name */
         },
         .id             = I2C_DRIVERID_SAA5249, /* in i2c.h */
diff --git a/drivers/media/video/saa6588.c b/drivers/media/video/saa6588.c
index 5ea36ee33b98..d60a783e0473 100644
--- a/drivers/media/video/saa6588.c
+++ b/drivers/media/video/saa6588.c
@@ -496,7 +496,6 @@ static int saa6588_command(struct i2c_client *client, unsigned int cmd,
 
 static struct i2c_driver driver = {
         .driver = {
-                .owner = THIS_MODULE,
                 .name = "i2c saa6588 driver",
         },
         .id = -1,               /* FIXME */
diff --git a/drivers/media/video/saa7110.c b/drivers/media/video/saa7110.c
index 58f60baa27e9..619ff0b7a1ff 100644
--- a/drivers/media/video/saa7110.c
+++ b/drivers/media/video/saa7110.c
@@ -587,7 +587,6 @@ saa7110_detach_client (struct i2c_client *client)
 
 static struct i2c_driver i2c_driver_saa7110 = {
         .driver = {
-                .owner = THIS_MODULE,
                 .name = "saa7110",
         },
 
diff --git a/drivers/media/video/saa7111.c b/drivers/media/video/saa7111.c
index 946eb74db374..acaeee592b54 100644
--- a/drivers/media/video/saa7111.c
+++ b/drivers/media/video/saa7111.c
@@ -590,7 +590,6 @@ saa7111_detach_client (struct i2c_client *client)
 
 static struct i2c_driver i2c_driver_saa7111 = {
         .driver = {
-                .owner = THIS_MODULE,
                 .name = "saa7111",
         },
 
diff --git a/drivers/media/video/saa7114.c b/drivers/media/video/saa7114.c
index df53b58a9dbc..b7ac0122f729 100644
--- a/drivers/media/video/saa7114.c
+++ b/drivers/media/video/saa7114.c
@@ -1204,7 +1204,6 @@ saa7114_detach_client (struct i2c_client *client)
 
 static struct i2c_driver i2c_driver_saa7114 = {
         .driver = {
-                .owner = THIS_MODULE,
                 .name = "saa7114",
         },
 
diff --git a/drivers/media/video/saa7115.c b/drivers/media/video/saa7115.c
index 6ac1ab4c9809..29e28c742cd4 100644
--- a/drivers/media/video/saa7115.c
+++ b/drivers/media/video/saa7115.c
@@ -1355,7 +1355,6 @@ static int saa7115_detach(struct i2c_client *client)
 /* i2c implementation */
 static struct i2c_driver i2c_driver_saa7115 = {
         .driver = {
-                .owner = THIS_MODULE,
                 .name = "saa7115",
         },
         .id = I2C_DRIVERID_SAA711X,
diff --git a/drivers/media/video/saa711x.c b/drivers/media/video/saa711x.c
index 3f7cfb7e46eb..8008537391b5 100644
--- a/drivers/media/video/saa711x.c
+++ b/drivers/media/video/saa711x.c
@@ -565,7 +565,6 @@ saa711x_detach_client (struct i2c_client *client)
 
 static struct i2c_driver i2c_driver_saa711x = {
         .driver = {
-                .owner = THIS_MODULE,
                 .name = "saa711x",
         },
 
diff --git a/drivers/media/video/saa7127.c b/drivers/media/video/saa7127.c
index 659cb8a0b21c..bca6ed0e2752 100644
--- a/drivers/media/video/saa7127.c
+++ b/drivers/media/video/saa7127.c
@@ -821,7 +821,6 @@ static int saa7127_detach(struct i2c_client *client)
 
 static struct i2c_driver i2c_driver_saa7127 = {
         .driver = {
-                .owner = THIS_MODULE,
                 .name = "saa7127",
         },
         .id = I2C_DRIVERID_SAA7127,
diff --git a/drivers/media/video/saa7134/saa6752hs.c b/drivers/media/video/saa7134/saa6752hs.c
index 0e8c9ed62b13..4615a982ac64 100644
--- a/drivers/media/video/saa7134/saa6752hs.c
+++ b/drivers/media/video/saa7134/saa6752hs.c
@@ -598,7 +598,6 @@ saa6752hs_command(struct i2c_client *client, unsigned int cmd, void *arg)
 
 static struct i2c_driver driver = {
         .driver = {
-                .owner  = THIS_MODULE,
                 .name   = "i2c saa6752hs MPEG encoder",
         },
         .id             = I2C_DRIVERID_SAA6752HS,
diff --git a/drivers/media/video/saa7185.c b/drivers/media/video/saa7185.c
index 64047d77388c..f72a9f796209 100644
--- a/drivers/media/video/saa7185.c
+++ b/drivers/media/video/saa7185.c
@@ -487,7 +487,6 @@ saa7185_detach_client (struct i2c_client *client)
 
 static struct i2c_driver i2c_driver_saa7185 = {
         .driver = {
-                .owner = THIS_MODULE,
                 .name = "saa7185",      /* name */
         },
 
diff --git a/drivers/media/video/saa7191.c b/drivers/media/video/saa7191.c
index a0f8eaf251ef..41f6f05a0436 100644
--- a/drivers/media/video/saa7191.c
+++ b/drivers/media/video/saa7191.c
@@ -789,7 +789,6 @@ static int saa7191_command(struct i2c_client *client, unsigned int cmd,
 
 static struct i2c_driver i2c_driver_saa7191 = {
         .driver = {
-                .owner  = THIS_MODULE,
                 .name   = "saa7191",
         },
         .id             = I2C_DRIVERID_SAA7191,
diff --git a/drivers/media/video/tda7432.c b/drivers/media/video/tda7432.c
index 59674d928ff7..549c9929f107 100644
--- a/drivers/media/video/tda7432.c
+++ b/drivers/media/video/tda7432.c
@@ -502,7 +502,6 @@ static int tda7432_command(struct i2c_client *client,
 
 static struct i2c_driver driver = {
         .driver = {
-                .owner   = THIS_MODULE,
                 .name    = "i2c tda7432 driver",
         },
         .id              = I2C_DRIVERID_TDA7432,
diff --git a/drivers/media/video/tda9840.c b/drivers/media/video/tda9840.c
index 8efc726874fc..2a353d237c52 100644
--- a/drivers/media/video/tda9840.c
+++ b/drivers/media/video/tda9840.c
@@ -222,7 +222,6 @@ static int detach(struct i2c_client *client)
 
 static struct i2c_driver driver = {
         .driver = {
-                .owner  = THIS_MODULE,
                 .name   = "tda9840",
         },
         .id     = I2C_DRIVERID_TDA9840,
diff --git a/drivers/media/video/tda9875.c b/drivers/media/video/tda9875.c
index de896167029e..9c3ecf7a0fed 100644
--- a/drivers/media/video/tda9875.c
+++ b/drivers/media/video/tda9875.c
@@ -373,7 +373,6 @@ static int tda9875_command(struct i2c_client *client,
 
 static struct i2c_driver driver = {
         .driver = {
-                .owner  = THIS_MODULE,
                 .name   = "i2c tda9875 driver",
         },
         .id             = I2C_DRIVERID_TDA9875,
diff --git a/drivers/media/video/tda9887.c b/drivers/media/video/tda9887.c
index 081f47805158..7165a1b9625a 100644
--- a/drivers/media/video/tda9887.c
+++ b/drivers/media/video/tda9887.c
@@ -824,7 +824,6 @@ static struct i2c_driver driver = {
         .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 e7e2213c39e1..17046d974b74 100644
--- a/drivers/media/video/tea6415c.c
+++ b/drivers/media/video/tea6415c.c
@@ -191,7 +191,6 @@ static int command(struct i2c_client *client, unsigned int cmd, void *arg)
 
 static struct i2c_driver driver = {
         .driver = {
-                .owner  = THIS_MODULE,
                 .name   = "tea6415c",
         },
         .id     = I2C_DRIVERID_TEA6415C,
diff --git a/drivers/media/video/tea6420.c b/drivers/media/video/tea6420.c
index 74cc25f04056..3dc89d9a4e42 100644
--- a/drivers/media/video/tea6420.c
+++ b/drivers/media/video/tea6420.c
@@ -168,7 +168,6 @@ static int command(struct i2c_client *client, unsigned int cmd, void *arg)
 
 static struct i2c_driver driver = {
         .driver = {
-                .owner  = THIS_MODULE,
                 .name   = "tea6420",
         },
         .id     = I2C_DRIVERID_TEA6420,
diff --git a/drivers/media/video/tuner-3036.c b/drivers/media/video/tuner-3036.c
index 83257af8db41..d97f66804c37 100644
--- a/drivers/media/video/tuner-3036.c
+++ b/drivers/media/video/tuner-3036.c
@@ -176,7 +176,6 @@ static struct i2c_driver
 i2c_driver_tuner = 
 {
         .driver = {
-                .owner  =       THIS_MODULE,
                 .name   =       "sab3036",
         },
         .id             =       I2C_DRIVERID_SAB3036,
diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c
index e8c854948de9..c13c7b95ef35 100644
--- a/drivers/media/video/tuner-core.c
+++ b/drivers/media/video/tuner-core.c
@@ -747,7 +747,6 @@ static struct i2c_driver driver = {
         .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 30bb2a3615e9..0292c5abf14a 100644
--- a/drivers/media/video/tvaudio.c
+++ b/drivers/media/video/tvaudio.c
@@ -1703,7 +1703,6 @@ static int chip_command(struct i2c_client *client,
 
 static struct i2c_driver driver = {
         .driver = {
-                .owner   = THIS_MODULE,
                 .name    = "generic i2c audio driver",
         },
         .id              = I2C_DRIVERID_TVAUDIO,
diff --git a/drivers/media/video/tveeprom.c b/drivers/media/video/tveeprom.c
index d8b5a1781809..8ac4cb82a459 100644
--- a/drivers/media/video/tveeprom.c
+++ b/drivers/media/video/tveeprom.c
@@ -779,7 +779,6 @@ tveeprom_detach_client (struct i2c_client *client)
 
 static struct i2c_driver i2c_driver_tveeprom = {
         .driver = {
-                .owner  = THIS_MODULE,
                 .name   = "tveeprom",
         },
         .id             = I2C_DRIVERID_TVEEPROM,
diff --git a/drivers/media/video/tvmixer.c b/drivers/media/video/tvmixer.c
index 5f4d01854767..e837f9f7fed6 100644
--- a/drivers/media/video/tvmixer.c
+++ b/drivers/media/video/tvmixer.c
@@ -229,7 +229,6 @@ static int tvmixer_release(struct inode *inode, struct file *file)
 static struct i2c_driver driver = {
 #ifdef I2C_PEC
         .driver = {
-                .owner   = THIS_MODULE,
                 .name    = "tv card mixer driver",
         },
 #else
diff --git a/drivers/media/video/tvp5150.c b/drivers/media/video/tvp5150.c
index 5eca71fa8cbd..a60442ea4f94 100644
--- a/drivers/media/video/tvp5150.c
+++ b/drivers/media/video/tvp5150.c
@@ -801,7 +801,6 @@ static int tvp5150_detach_client(struct i2c_client *client)
 
 static struct i2c_driver driver = {
         .driver = {
-                .owner = THIS_MODULE,
                 .name = "tvp5150",
         },
 
diff --git a/drivers/media/video/vpx3220.c b/drivers/media/video/vpx3220.c
index b85b5981fb8d..8dcee8b60e21 100644
--- a/drivers/media/video/vpx3220.c
+++ b/drivers/media/video/vpx3220.c
@@ -722,7 +722,6 @@ vpx3220_attach_adapter (struct i2c_adapter *adapter)
 
 static struct i2c_driver vpx3220_i2c_driver = {
         .driver = {
-                .owner = THIS_MODULE,
                 .name = "vpx3220",
         },
 
diff --git a/drivers/media/video/wm8775.c b/drivers/media/video/wm8775.c
index 22875f1fa1ab..bbfd55cd9948 100644
--- a/drivers/media/video/wm8775.c
+++ b/drivers/media/video/wm8775.c
@@ -233,7 +233,6 @@ static int wm8775_detach(struct i2c_client *client)
 /* i2c implementation */
 static struct i2c_driver i2c_driver = {
         .driver = {
-                .owner = THIS_MODULE,
                 .name = "wm8775",
         },
 
diff --git a/drivers/video/matrox/matroxfb_maven.c b/drivers/video/matrox/matroxfb_maven.c
index f6fdb69af0b4..255875378a3f 100644
--- a/drivers/video/matrox/matroxfb_maven.c
+++ b/drivers/video/matrox/matroxfb_maven.c
@@ -1294,7 +1294,6 @@ static int maven_command(struct i2c_client* client, unsigned int cmd, void* arg)
 
 static struct i2c_driver maven_driver={
         .driver = {
-                .owner  = THIS_MODULE,
                 .name   = "maven",
         },
         .id             = I2C_DRIVERID_MGATVO,
diff --git a/sound/oss/dmasound/dac3550a.c b/sound/oss/dmasound/dac3550a.c
index 835e0cfc3bf3..7360d8954d60 100644
--- a/sound/oss/dmasound/dac3550a.c
+++ b/sound/oss/dmasound/dac3550a.c
@@ -42,7 +42,6 @@ static int daca_detach_client(struct i2c_client *client);
 
 struct i2c_driver daca_driver = {  
         .driver = {
-                .owner          = THIS_MODULE,
                 .name           = "DAC3550A driver  V " DACA_VERSION,
         },
         .id                     = I2C_DRIVERID_DACA,
diff --git a/sound/oss/dmasound/tas_common.c b/sound/oss/dmasound/tas_common.c
index bd6910af286c..81315996c0f1 100644
--- a/sound/oss/dmasound/tas_common.c
+++ b/sound/oss/dmasound/tas_common.c
@@ -48,7 +48,6 @@ static int tas_detach_client(struct i2c_client *);
 
 struct i2c_driver tas_driver = {
         .driver = {
-                .owner  = THIS_MODULE,
                 .name   = "tas",
         },
         .attach_adapter = tas_attach_adapter,
diff --git a/sound/ppc/keywest.c b/sound/ppc/keywest.c
index d532924b5a5a..6058c2dd1b7f 100644
--- a/sound/ppc/keywest.c
+++ b/sound/ppc/keywest.c
@@ -42,7 +42,6 @@ static int keywest_detach_client(struct i2c_client *client);
 
 struct i2c_driver keywest_driver = {  
         .driver = {
-                .owner = THIS_MODULE,
                 .name = "PMac Keywest Audio",
         },
         .id = I2C_DRIVERID_KEYWEST,