From 8a9947552d43b0d20d5fa23ac0ba435d526be454 Mon Sep 17 00:00:00 2001
From: Jean Delvare <khali@linux-fr.org>
Date: Sat, 26 Nov 2005 20:28:06 +0100
Subject: [PATCH] i2c: Drop i2c_driver.flags, 2 of 3

Just about every i2c chip driver sets the I2C_DF_NOTIFY flag, so we
can simply make it the default and drop the flag. If any driver really
doesn't want to be notified when i2c adapters are added, that driver
can simply omit to set .attach_adapter. This approach is also more
robust as it prevents accidental NULL pointer dereferences.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
 drivers/media/video/tda9840.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'drivers/media/video/tda9840.c')

diff --git a/drivers/media/video/tda9840.c b/drivers/media/video/tda9840.c
index 1794686612c..f29fb507075 100644
--- a/drivers/media/video/tda9840.c
+++ b/drivers/media/video/tda9840.c
@@ -224,7 +224,6 @@ static struct i2c_driver driver = {
 	.owner	= THIS_MODULE,
 	.name	= "tda9840",
 	.id	= I2C_DRIVERID_TDA9840,
-	.flags	= I2C_DF_NOTIFY,
 	.attach_adapter	= attach,
 	.detach_client	= detach,
 	.command	= command,
-- 
cgit v1.2.3-70-g09d2


From 604f28e2b8d34cbaf08f0351374645f161335a82 Mon Sep 17 00:00:00 2001
From: Laurent Riffard <laurent.riffard@free.fr>
Date: Sat, 26 Nov 2005 20:43:39 +0100
Subject: [PATCH] i2c: Drop i2c_driver.{owner,name}, 5 of 11

We should use the i2c_driver.driver's .name and .owner fields
instead of the i2c_driver's ones.

This patch updates the drivers/media/video and usb/media drivers.

Signed-off-by: Laurent Riffard <laurent.riffard@free.fr>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
 drivers/media/video/adv7170.c                  |  6 ++++--
 drivers/media/video/adv7175.c                  |  6 ++++--
 drivers/media/video/bt819.c                    |  6 ++++--
 drivers/media/video/bt832.c                    |  6 ++++--
 drivers/media/video/bt856.c                    |  6 ++++--
 drivers/media/video/bttv-i2c.c                 |  2 +-
 drivers/media/video/cs53l32a.c                 | 13 ++++++++-----
 drivers/media/video/cx25840/cx25840-core.c     |  6 ++++--
 drivers/media/video/cx25840/cx25840.h          |  7 ++++---
 drivers/media/video/cx88/cx88-i2c.c            |  2 +-
 drivers/media/video/indycam.c                  |  6 ++++--
 drivers/media/video/ir-kbd-i2c.c               |  5 ++++-
 drivers/media/video/msp3400.c                  | 19 +++++++++++--------
 drivers/media/video/ovcamchip/ovcamchip_core.c |  6 ++++--
 drivers/media/video/saa5246a.c                 |  6 ++++--
 drivers/media/video/saa5249.c                  |  6 ++++--
 drivers/media/video/saa6588.c                  |  6 ++++--
 drivers/media/video/saa7110.c                  |  6 ++++--
 drivers/media/video/saa7111.c                  |  6 ++++--
 drivers/media/video/saa7114.c                  |  6 ++++--
 drivers/media/video/saa7115.c                  | 13 ++++++++-----
 drivers/media/video/saa711x.c                  |  6 ++++--
 drivers/media/video/saa7127.c                  | 16 ++++++++++------
 drivers/media/video/saa7134/saa6752hs.c        |  6 ++++--
 drivers/media/video/saa7134/saa7134-i2c.c      |  4 ++--
 drivers/media/video/saa7185.c                  |  6 ++++--
 drivers/media/video/saa7191.c                  |  6 ++++--
 drivers/media/video/tda7432.c                  |  6 ++++--
 drivers/media/video/tda9840.c                  |  6 ++++--
 drivers/media/video/tda9875.c                  |  6 ++++--
 drivers/media/video/tda9887.c                  |  4 ++--
 drivers/media/video/tea6415c.c                 |  6 ++++--
 drivers/media/video/tea6420.c                  |  6 ++++--
 drivers/media/video/tuner-3036.c               |  6 ++++--
 drivers/media/video/tuner-core.c               |  6 +++---
 drivers/media/video/tvaudio.c                  |  6 ++++--
 drivers/media/video/tveeprom.c                 |  6 ++++--
 drivers/media/video/tvmixer.c                  |  8 ++++++--
 drivers/media/video/tvp5150.c                  |  6 ++++--
 drivers/media/video/vpx3220.c                  |  6 ++++--
 drivers/media/video/wm8775.c                   | 10 ++++++----
 drivers/media/video/zoran_driver.c             | 14 +++++++-------
 drivers/usb/media/w9968cf.c                    |  4 ++--
 include/media/tuner.h                          |  7 ++++---
 44 files changed, 191 insertions(+), 111 deletions(-)

(limited to 'drivers/media/video/tda9840.c')

diff --git a/drivers/media/video/adv7170.c b/drivers/media/video/adv7170.c
index 622b1619a7e..c5f1c6b681b 100644
--- a/drivers/media/video/adv7170.c
+++ b/drivers/media/video/adv7170.c
@@ -497,8 +497,10 @@ adv7170_detach_client (struct i2c_client *client)
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver i2c_driver_adv7170 = {
-	.owner = THIS_MODULE,
-	.name = "adv7170",	/* name */
+	.driver = {
+		.owner = THIS_MODULE,
+		.name = "adv7170",	/* name */
+	},
 
 	.id = I2C_DRIVERID_ADV7170,
 
diff --git a/drivers/media/video/adv7175.c b/drivers/media/video/adv7175.c
index d4859b44571..33158aa734d 100644
--- a/drivers/media/video/adv7175.c
+++ b/drivers/media/video/adv7175.c
@@ -547,8 +547,10 @@ adv7175_detach_client (struct i2c_client *client)
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver i2c_driver_adv7175 = {
-	.owner = THIS_MODULE,
-	.name = "adv7175",	/* name */
+	.driver = {
+		.owner = THIS_MODULE,
+		.name = "adv7175",	/* name */
+	},
 
 	.id = I2C_DRIVERID_ADV7175,
 
diff --git a/drivers/media/video/bt819.c b/drivers/media/video/bt819.c
index 741e59af099..5868bbb73a0 100644
--- a/drivers/media/video/bt819.c
+++ b/drivers/media/video/bt819.c
@@ -622,8 +622,10 @@ bt819_detach_client (struct i2c_client *client)
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver i2c_driver_bt819 = {
-	.owner = THIS_MODULE,
-	.name = "bt819",
+	.driver = {
+		.owner = THIS_MODULE,
+		.name = "bt819",
+	},
 
 	.id = I2C_DRIVERID_BT819,
 
diff --git a/drivers/media/video/bt832.c b/drivers/media/video/bt832.c
index 4ed13860b52..347eb711fc0 100644
--- a/drivers/media/video/bt832.c
+++ b/drivers/media/video/bt832.c
@@ -230,8 +230,10 @@ bt832_command(struct i2c_client *client, unsigned int cmd, void *arg)
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver driver = {
-	.owner          = THIS_MODULE,
-	.name           = "i2c bt832 driver",
+	.driver = {
+		.owner  = THIS_MODULE,
+		.name   = "i2c bt832 driver",
+	},
 	.id             = -1, /* FIXME */
 	.attach_adapter = bt832_probe,
 	.detach_client  = bt832_detach,
diff --git a/drivers/media/video/bt856.c b/drivers/media/video/bt856.c
index d4bba8efac6..207525aa156 100644
--- a/drivers/media/video/bt856.c
+++ b/drivers/media/video/bt856.c
@@ -404,8 +404,10 @@ bt856_detach_client (struct i2c_client *client)
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver i2c_driver_bt856 = {
-	.owner = THIS_MODULE,
-	.name = "bt856",
+	.driver = {
+		.owner = THIS_MODULE,
+		.name = "bt856",
+	},
 
 	.id = I2C_DRIVERID_BT856,
 
diff --git a/drivers/media/video/bttv-i2c.c b/drivers/media/video/bttv-i2c.c
index 77619eb131f..d6418c023d3 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 f442ce3ba74..60484f93648 100644
--- a/drivers/media/video/cs53l32a.c
+++ b/drivers/media/video/cs53l32a.c
@@ -42,15 +42,16 @@ MODULE_PARM_DESC(debug, "Debugging messages\n\t\t\t0=Off (default), 1=On");
 #define cs53l32a_dbg(fmt, arg...) \
 	do { \
 		if (debug) \
-			printk(KERN_INFO "%s debug %d-%04x: " fmt, client->driver->name, \
+			printk(KERN_INFO "%s debug %d-%04x: " fmt, \
+			       client->driver->driver.name, \
 			       i2c_adapter_id(client->adapter), client->addr , ## arg); \
 	} while (0)
 
 #define cs53l32a_err(fmt, arg...) do { \
-	printk(KERN_ERR "%s %d-%04x: " fmt, client->driver->name, \
+	printk(KERN_ERR "%s %d-%04x: " fmt, client->driver->driver.name, \
 		i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
 #define cs53l32a_info(fmt, arg...) do { \
-	printk(KERN_INFO "%s %d-%04x: " fmt, client->driver->name, \
+	printk(KERN_INFO "%s %d-%04x: " fmt, client->driver->driver.name, \
 		i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
 
 static unsigned short normal_i2c[] = { 0x22 >> 1, I2C_CLIENT_END };
@@ -215,12 +216,14 @@ static int cs53l32a_detach(struct i2c_client *client)
 
 /* i2c implementation */
 static struct i2c_driver i2c_driver = {
-	.name = "cs53l32a",
+	.driver = {
+		.owner = THIS_MODULE,
+		.name = "cs53l32a",
+	},
 	.id = I2C_DRIVERID_CS53L32A,
 	.attach_adapter = cs53l32a_probe,
 	.detach_client = cs53l32a_detach,
 	.command = cs53l32a_command,
-	.owner = THIS_MODULE,
 };
 
 
diff --git a/drivers/media/video/cx25840/cx25840-core.c b/drivers/media/video/cx25840/cx25840-core.c
index 0b278abe879..830d5195d1c 100644
--- a/drivers/media/video/cx25840/cx25840-core.c
+++ b/drivers/media/video/cx25840/cx25840-core.c
@@ -843,14 +843,16 @@ static int cx25840_detach_client(struct i2c_client *client)
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver i2c_driver_cx25840 = {
-	.name = "cx25840",
+	.driver = {
+		.owner = THIS_MODULE,
+		.name = "cx25840",
+	},
 
 	.id = I2C_DRIVERID_CX25840,
 
 	.attach_adapter = cx25840_attach_adapter,
 	.detach_client = cx25840_detach_client,
 	.command = cx25840_command,
-	.owner = THIS_MODULE,
 };
 
 
diff --git a/drivers/media/video/cx25840/cx25840.h b/drivers/media/video/cx25840/cx25840.h
index 4932ed1c9b1..40aa59f9c52 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 9790d412f19..4a8fb161b16 100644
--- a/drivers/media/video/cx88/cx88-i2c.c
+++ b/drivers/media/video/cx88/cx88-i2c.c
@@ -94,7 +94,7 @@ static int attach_inform(struct i2c_client *client)
 	struct cx88_core *core = i2c_get_adapdata(client->adapter);
 
 	dprintk(1, "%s i2c attach [addr=0x%x,client=%s]\n",
-		client->driver->name, client->addr, client->name);
+		client->driver->driver.name, client->addr, client->name);
 	if (!client->driver->command)
 		return 0;
 
diff --git a/drivers/media/video/indycam.c b/drivers/media/video/indycam.c
index 3eba514cdb2..96a808e8b2c 100644
--- a/drivers/media/video/indycam.c
+++ b/drivers/media/video/indycam.c
@@ -451,8 +451,10 @@ static int indycam_command(struct i2c_client *client, unsigned int cmd,
 }
 
 static struct i2c_driver i2c_driver_indycam = {
-	.owner		= THIS_MODULE,
-	.name		= "indycam",
+	.driver = {
+		.owner	= THIS_MODULE,
+		.name 	= "indycam",
+	},
 	.id		= I2C_DRIVERID_INDYCAM,
 	.attach_adapter = indycam_probe,
 	.detach_client	= indycam_detach,
diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c
index 2e2f78a4afc..82c7f504265 100644
--- a/drivers/media/video/ir-kbd-i2c.c
+++ b/drivers/media/video/ir-kbd-i2c.c
@@ -278,7 +278,10 @@ static int ir_detach(struct i2c_client *client);
 static int ir_probe(struct i2c_adapter *adap);
 
 static struct i2c_driver driver = {
-	.name           = "ir remote kbd driver",
+	.driver = {
+		.owner  = THIS_MODULE,
+		.name   = "ir remote kbd driver",
+	},
 	.id             = I2C_DRIVERID_INFRARED,
 	.attach_adapter = ir_probe,
 	.detach_client  = ir_detach,
diff --git a/drivers/media/video/msp3400.c b/drivers/media/video/msp3400.c
index c5e8ad3aac4..3847d890d63 100644
--- a/drivers/media/video/msp3400.c
+++ b/drivers/media/video/msp3400.c
@@ -59,7 +59,8 @@
 #define msp3400_dbg(fmt, arg...) \
 	do { \
 		if (debug) \
-			printk(KERN_INFO "%s debug %d-%04x: " fmt, client->driver->name, \
+			printk(KERN_INFO "%s debug %d-%04x: " fmt, \
+			       client->driver->driver.name, \
 			       i2c_adapter_id(client->adapter), client->addr , ## arg); \
 	} while (0)
 
@@ -67,7 +68,8 @@
 #define msp3400_dbg_mediumvol(fmt, arg...) \
 	do { \
 		if (debug >= 2) \
-			printk(KERN_INFO "%s debug %d-%04x: " fmt, client->driver->name, \
+			printk(KERN_INFO "%s debug %d-%04x: " fmt, \
+				client->driver->driver.name, \
 				i2c_adapter_id(client->adapter), client->addr , ## arg); \
 	} while (0)
 
@@ -75,18 +77,19 @@
 #define msp3400_dbg_highvol(fmt, arg...) \
 	do { \
 		if (debug >= 16) \
-			printk(KERN_INFO "%s debug %d-%04x: " fmt, client->driver->name, \
+			printk(KERN_INFO "%s debug %d-%04x: " fmt, \
+				client->driver->driver.name, \
 				i2c_adapter_id(client->adapter), client->addr , ## arg); \
 	} while (0)
 
 #define msp3400_err(fmt, arg...) do { \
-	printk(KERN_ERR "%s %d-%04x: " fmt, client->driver->name, \
+	printk(KERN_ERR "%s %d-%04x: " fmt, client->driver->driver.name, \
 		i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
 #define msp3400_warn(fmt, arg...) do { \
-	printk(KERN_WARNING "%s %d-%04x: " fmt, client->driver->name, \
+	printk(KERN_WARNING "%s %d-%04x: " fmt, client->driver->driver.name, \
 		i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
 #define msp3400_info(fmt, arg...) do { \
-	printk(KERN_INFO "%s %d-%04x: " fmt, client->driver->name, \
+	printk(KERN_INFO "%s %d-%04x: " fmt, client->driver->driver.name, \
 		i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
 
 #define OPMODE_AUTO    -1
@@ -1561,13 +1564,13 @@ static int msp_resume(struct device * dev);
 static void msp_wake_thread(struct i2c_client *client);
 
 static struct i2c_driver driver = {
-	.owner          = THIS_MODULE,
-	.name           = "msp3400",
 	.id             = I2C_DRIVERID_MSP3400,
 	.attach_adapter = msp_probe,
 	.detach_client  = msp_detach,
 	.command        = msp_command,
 	.driver = {
+		.owner   = THIS_MODULE,
+		.name    = "i2c msp3400 driver",
 		.suspend = msp_suspend,
 		.resume  = msp_resume,
 	},
diff --git a/drivers/media/video/ovcamchip/ovcamchip_core.c b/drivers/media/video/ovcamchip/ovcamchip_core.c
index 390d0d6c783..9ac398b2d91 100644
--- a/drivers/media/video/ovcamchip/ovcamchip_core.c
+++ b/drivers/media/video/ovcamchip/ovcamchip_core.c
@@ -410,8 +410,10 @@ static int ovcamchip_command(struct i2c_client *c, unsigned int cmd, void *arg)
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver driver = {
-	.owner =		THIS_MODULE,
-	.name =			"ovcamchip",
+	.driver = {
+		.owner =	THIS_MODULE,
+		.name =		"ovcamchip",
+	},
 	.id =			I2C_DRIVERID_OVCAMCHIP,
 	.class =		I2C_CLASS_CAM_DIGITAL,
 	.attach_adapter =	ovcamchip_attach,
diff --git a/drivers/media/video/saa5246a.c b/drivers/media/video/saa5246a.c
index 9bf686989aa..8c99edbe184 100644
--- a/drivers/media/video/saa5246a.c
+++ b/drivers/media/video/saa5246a.c
@@ -163,8 +163,10 @@ static int saa5246a_command(struct i2c_client *device, unsigned int cmd,
 
 static struct i2c_driver i2c_driver_videotext =
 {
-	.owner 		= THIS_MODULE,
-	.name 		= IF_NAME,		/* name */
+	.driver = {
+		.owner 	= THIS_MODULE,
+		.name 	= IF_NAME,		/* name */
+	},
 	.id 		= I2C_DRIVERID_SAA5249, /* in i2c.h */
 	.attach_adapter = saa5246a_probe,
 	.detach_client  = saa5246a_detach,
diff --git a/drivers/media/video/saa5249.c b/drivers/media/video/saa5249.c
index 811e8639603..5b346bdb1d5 100644
--- a/drivers/media/video/saa5249.c
+++ b/drivers/media/video/saa5249.c
@@ -236,8 +236,10 @@ static int saa5249_command(struct i2c_client *device,
 
 static struct i2c_driver i2c_driver_videotext = 
 {
-	.owner 		= THIS_MODULE,
-	.name 		= IF_NAME,		/* name */
+	.driver = {
+		.owner 	= THIS_MODULE,
+		.name 	= IF_NAME,		/* name */
+	},
 	.id 		= I2C_DRIVERID_SAA5249, /* in i2c.h */
 	.attach_adapter = saa5249_probe,
 	.detach_client  = saa5249_detach,
diff --git a/drivers/media/video/saa6588.c b/drivers/media/video/saa6588.c
index 3d4076ca67c..5ea36ee33b9 100644
--- a/drivers/media/video/saa6588.c
+++ b/drivers/media/video/saa6588.c
@@ -495,8 +495,10 @@ static int saa6588_command(struct i2c_client *client, unsigned int cmd,
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver driver = {
-	.owner = THIS_MODULE,
-	.name = "i2c saa6588 driver",
+	.driver = {
+		.owner = THIS_MODULE,
+		.name = "i2c saa6588 driver",
+	},
 	.id = -1,		/* FIXME */
 	.attach_adapter = saa6588_probe,
 	.detach_client = saa6588_detach,
diff --git a/drivers/media/video/saa7110.c b/drivers/media/video/saa7110.c
index 8affa63c8b2..58f60baa27e 100644
--- a/drivers/media/video/saa7110.c
+++ b/drivers/media/video/saa7110.c
@@ -586,8 +586,10 @@ saa7110_detach_client (struct i2c_client *client)
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver i2c_driver_saa7110 = {
-	.owner = THIS_MODULE,
-	.name = "saa7110",
+	.driver = {
+		.owner = THIS_MODULE,
+		.name = "saa7110",
+	},
 
 	.id = I2C_DRIVERID_SAA7110,
 
diff --git a/drivers/media/video/saa7111.c b/drivers/media/video/saa7111.c
index 2b220456451..946eb74db37 100644
--- a/drivers/media/video/saa7111.c
+++ b/drivers/media/video/saa7111.c
@@ -589,8 +589,10 @@ saa7111_detach_client (struct i2c_client *client)
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver i2c_driver_saa7111 = {
-	.owner = THIS_MODULE,
-	.name = "saa7111",
+	.driver = {
+		.owner = THIS_MODULE,
+		.name = "saa7111",
+	},
 
 	.id = I2C_DRIVERID_SAA7111A,
 
diff --git a/drivers/media/video/saa7114.c b/drivers/media/video/saa7114.c
index 285f6c7a8f7..df53b58a9db 100644
--- a/drivers/media/video/saa7114.c
+++ b/drivers/media/video/saa7114.c
@@ -1203,8 +1203,10 @@ saa7114_detach_client (struct i2c_client *client)
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver i2c_driver_saa7114 = {
-	.owner = THIS_MODULE,
-	.name = "saa7114",
+	.driver = {
+		.owner = THIS_MODULE,
+		.name = "saa7114",
+	},
 
 	.id = I2C_DRIVERID_SAA7114,
 
diff --git a/drivers/media/video/saa7115.c b/drivers/media/video/saa7115.c
index 79aadd2d408..6ac1ab4c980 100644
--- a/drivers/media/video/saa7115.c
+++ b/drivers/media/video/saa7115.c
@@ -52,15 +52,16 @@ MODULE_PARM_DESC(debug, "Debug level (0-1)");
 #define saa7115_dbg(fmt,arg...) \
 	do { \
 		if (debug) \
-			printk(KERN_INFO "%s debug %d-%04x: " fmt, client->driver->name, \
+			printk(KERN_INFO "%s debug %d-%04x: " fmt, \
+			       client->driver->driver.name, \
 			       i2c_adapter_id(client->adapter), client->addr , ## arg); \
 	} while (0)
 
 #define saa7115_err(fmt, arg...) do { \
-	printk(KERN_ERR "%s %d-%04x: " fmt, client->driver->name, \
+	printk(KERN_ERR "%s %d-%04x: " fmt, client->driver->driver.name, \
 	       i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
 #define saa7115_info(fmt, arg...) do { \
-	printk(KERN_INFO "%s %d-%04x: " fmt, client->driver->name, \
+	printk(KERN_INFO "%s %d-%04x: " fmt, client->driver->driver.name, \
 	       i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
 
 static unsigned short normal_i2c[] = { 0x42 >> 1, 0x40 >> 1, I2C_CLIENT_END };
@@ -1353,12 +1354,14 @@ static int saa7115_detach(struct i2c_client *client)
 
 /* i2c implementation */
 static struct i2c_driver i2c_driver_saa7115 = {
-	.name = "saa7115",
+	.driver = {
+		.owner = THIS_MODULE,
+		.name = "saa7115",
+	},
 	.id = I2C_DRIVERID_SAA711X,
 	.attach_adapter = saa7115_probe,
 	.detach_client = saa7115_detach,
 	.command = saa7115_command,
-	.owner = THIS_MODULE,
 };
 
 
diff --git a/drivers/media/video/saa711x.c b/drivers/media/video/saa711x.c
index 44bfc047704..3f7cfb7e46e 100644
--- a/drivers/media/video/saa711x.c
+++ b/drivers/media/video/saa711x.c
@@ -564,8 +564,10 @@ saa711x_detach_client (struct i2c_client *client)
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver i2c_driver_saa711x = {
-	.owner = THIS_MODULE,
-	.name = "saa711x",
+	.driver = {
+		.owner = THIS_MODULE,
+		.name = "saa711x",
+	},
 
 	.id = I2C_DRIVERID_SAA711X,
 
diff --git a/drivers/media/video/saa7127.c b/drivers/media/video/saa7127.c
index 1f4b4159944..659cb8a0b21 100644
--- a/drivers/media/video/saa7127.c
+++ b/drivers/media/video/saa7127.c
@@ -69,7 +69,8 @@ MODULE_PARM_DESC(test_image, "test_image (0-1)");
 #define saa7127_dbg(fmt, arg...) \
 	do { \
 		if (debug >= 1) \
-			printk(KERN_INFO "%s debug %d-%04x: " fmt, client->driver->name, \
+			printk(KERN_INFO "%s debug %d-%04x: " fmt, \
+			       client->driver->driver.name, \
 			       i2c_adapter_id(client->adapter), client->addr , ## arg); \
 	} while (0)
 
@@ -77,15 +78,16 @@ MODULE_PARM_DESC(test_image, "test_image (0-1)");
 #define saa7127_dbg_highvol(fmt, arg...) \
 	do { \
 		if (debug == 2) \
-			printk(KERN_INFO "%s debug %d-%04x: " fmt, client->driver->name, \
+			printk(KERN_INFO "%s debug %d-%04x: " fmt, \
+			       client->driver->driver.name, \
 			       i2c_adapter_id(client->adapter), client->addr , ## arg); \
 	} while (0)
 
 #define saa7127_err(fmt, arg...) do { \
-	printk(KERN_ERR "%s %d-%04x: " fmt, client->driver->name, \
+	printk(KERN_ERR "%s %d-%04x: " fmt, client->driver->driver.name, \
 	       i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
 #define saa7127_info(fmt, arg...) do { \
-	printk(KERN_INFO "%s %d-%04x: " fmt, client->driver->name, \
+	printk(KERN_INFO "%s %d-%04x: " fmt, client->driver->driver.name, \
 	       i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
 
 static unsigned short normal_i2c[] = { 0x88 >> 1, I2C_CLIENT_END };
@@ -818,12 +820,14 @@ static int saa7127_detach(struct i2c_client *client)
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver i2c_driver_saa7127 = {
-	.name = "saa7127",
+	.driver = {
+		.owner = THIS_MODULE,
+		.name = "saa7127",
+	},
 	.id = I2C_DRIVERID_SAA7127,
 	.attach_adapter = saa7127_probe,
 	.detach_client = saa7127_detach,
 	.command = saa7127_command,
-	.owner = THIS_MODULE,
 };
 
 
diff --git a/drivers/media/video/saa7134/saa6752hs.c b/drivers/media/video/saa7134/saa6752hs.c
index 68206060c92..0e8c9ed62b1 100644
--- a/drivers/media/video/saa7134/saa6752hs.c
+++ b/drivers/media/video/saa7134/saa6752hs.c
@@ -597,8 +597,10 @@ saa6752hs_command(struct i2c_client *client, unsigned int cmd, void *arg)
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver driver = {
-	.owner          = THIS_MODULE,
-	.name           = "i2c saa6752hs MPEG encoder",
+	.driver = {
+		.owner  = THIS_MODULE,
+		.name   = "i2c saa6752hs MPEG encoder",
+	},
 	.id             = I2C_DRIVERID_SAA6752HS,
 	.attach_adapter = saa6752hs_probe,
 	.detach_client  = saa6752hs_detach,
diff --git a/drivers/media/video/saa7134/saa7134-i2c.c b/drivers/media/video/saa7134/saa7134-i2c.c
index df9dd36721e..1792d03d621 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 9f37585d3f7..64047d77388 100644
--- a/drivers/media/video/saa7185.c
+++ b/drivers/media/video/saa7185.c
@@ -486,8 +486,10 @@ saa7185_detach_client (struct i2c_client *client)
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver i2c_driver_saa7185 = {
-	.owner = THIS_MODULE,
-	.name = "saa7185",	/* name */
+	.driver = {
+		.owner = THIS_MODULE,
+		.name = "saa7185",	/* name */
+	},
 
 	.id = I2C_DRIVERID_SAA7185B,
 
diff --git a/drivers/media/video/saa7191.c b/drivers/media/video/saa7191.c
index 6be98fc0fe2..a0f8eaf251e 100644
--- a/drivers/media/video/saa7191.c
+++ b/drivers/media/video/saa7191.c
@@ -788,8 +788,10 @@ static int saa7191_command(struct i2c_client *client, unsigned int cmd,
 }
 
 static struct i2c_driver i2c_driver_saa7191 = {
-	.owner		= THIS_MODULE,
-	.name		= "saa7191",
+	.driver = {
+		.owner	= THIS_MODULE,
+		.name 	= "saa7191",
+	},
 	.id		= I2C_DRIVERID_SAA7191,
 	.attach_adapter = saa7191_probe,
 	.detach_client	= saa7191_detach,
diff --git a/drivers/media/video/tda7432.c b/drivers/media/video/tda7432.c
index 239a58666a1..59674d928ff 100644
--- a/drivers/media/video/tda7432.c
+++ b/drivers/media/video/tda7432.c
@@ -501,8 +501,10 @@ static int tda7432_command(struct i2c_client *client,
 }
 
 static struct i2c_driver driver = {
-	.owner           = THIS_MODULE,
-	.name            = "i2c tda7432 driver",
+	.driver = {
+		.owner   = THIS_MODULE,
+		.name    = "i2c tda7432 driver",
+	},
 	.id              = I2C_DRIVERID_TDA7432,
 	.attach_adapter  = tda7432_probe,
 	.detach_client   = tda7432_detach,
diff --git a/drivers/media/video/tda9840.c b/drivers/media/video/tda9840.c
index f29fb507075..8efc726874f 100644
--- a/drivers/media/video/tda9840.c
+++ b/drivers/media/video/tda9840.c
@@ -221,8 +221,10 @@ static int detach(struct i2c_client *client)
 }
 
 static struct i2c_driver driver = {
-	.owner	= THIS_MODULE,
-	.name	= "tda9840",
+	.driver = {
+		.owner	= THIS_MODULE,
+		.name	= "tda9840",
+	},
 	.id	= I2C_DRIVERID_TDA9840,
 	.attach_adapter	= attach,
 	.detach_client	= detach,
diff --git a/drivers/media/video/tda9875.c b/drivers/media/video/tda9875.c
index d053b644550..de896167029 100644
--- a/drivers/media/video/tda9875.c
+++ b/drivers/media/video/tda9875.c
@@ -372,8 +372,10 @@ static int tda9875_command(struct i2c_client *client,
 
 
 static struct i2c_driver driver = {
-	.owner          = THIS_MODULE,
-	.name           = "i2c tda9875 driver",
+	.driver = {
+		.owner  = THIS_MODULE,
+		.name   = "i2c tda9875 driver",
+	},
 	.id             = I2C_DRIVERID_TDA9875,
 	.attach_adapter = tda9875_probe,
 	.detach_client  = tda9875_detach,
diff --git a/drivers/media/video/tda9887.c b/drivers/media/video/tda9887.c
index 324f61bf714..081f4780515 100644
--- a/drivers/media/video/tda9887.c
+++ b/drivers/media/video/tda9887.c
@@ -819,13 +819,13 @@ static int tda9887_resume(struct device * dev)
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver driver = {
-	.owner          = THIS_MODULE,
-	.name           = "i2c tda9887 driver",
 	.id             = -1, /* FIXME */
 	.attach_adapter = tda9887_probe,
 	.detach_client  = tda9887_detach,
 	.command        = tda9887_command,
 	.driver = {
+		.owner   = THIS_MODULE,
+		.name    = "i2c tda9887 driver",
 		.suspend = tda9887_suspend,
 		.resume  = tda9887_resume,
 	},
diff --git a/drivers/media/video/tea6415c.c b/drivers/media/video/tea6415c.c
index 96d88ce60c9..e7e2213c39e 100644
--- a/drivers/media/video/tea6415c.c
+++ b/drivers/media/video/tea6415c.c
@@ -190,8 +190,10 @@ static int command(struct i2c_client *client, unsigned int cmd, void *arg)
 }
 
 static struct i2c_driver driver = {
-	.owner	= THIS_MODULE,
-	.name 	= "tea6415c",
+	.driver = {
+		.owner	= THIS_MODULE,
+		.name 	= "tea6415c",
+	},
 	.id 	= I2C_DRIVERID_TEA6415C,
 	.attach_adapter	= attach,
 	.detach_client	= detach,
diff --git a/drivers/media/video/tea6420.c b/drivers/media/video/tea6420.c
index fd417de9584..74cc25f0405 100644
--- a/drivers/media/video/tea6420.c
+++ b/drivers/media/video/tea6420.c
@@ -167,8 +167,10 @@ static int command(struct i2c_client *client, unsigned int cmd, void *arg)
 }
 
 static struct i2c_driver driver = {
-	.owner	= THIS_MODULE,
-	.name	= "tea6420",
+	.driver = {
+		.owner	= THIS_MODULE,
+		.name	= "tea6420",
+	},
 	.id	= I2C_DRIVERID_TEA6420,
 	.attach_adapter	= attach,
 	.detach_client	= detach,
diff --git a/drivers/media/video/tuner-3036.c b/drivers/media/video/tuner-3036.c
index 3505cec2e65..83257af8db4 100644
--- a/drivers/media/video/tuner-3036.c
+++ b/drivers/media/video/tuner-3036.c
@@ -175,8 +175,10 @@ tuner_probe(struct i2c_adapter *adap)
 static struct i2c_driver 
 i2c_driver_tuner = 
 {
-	.owner		=	THIS_MODULE,
-	.name		=	"sab3036",
+	.driver = {
+		.owner	=	THIS_MODULE,
+		.name	=	"sab3036",
+	},
 	.id		=	I2C_DRIVERID_SAB3036,
 	.attach_adapter =	tuner_probe,
 	.detach_client  =	tuner_detach,
diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c
index 6328f0954e7..e8c854948de 100644
--- a/drivers/media/video/tuner-core.c
+++ b/drivers/media/video/tuner-core.c
@@ -206,7 +206,7 @@ static void set_type(struct i2c_client *c, unsigned int type,
 
 	set_freq(c, t->freq);
 	tuner_dbg("%s %s I2C addr 0x%02x with type %d used for 0x%02x\n",
-		  c->adapter->name, c->driver->name, c->addr << 1, type,
+		  c->adapter->name, c->driver->driver.name, c->addr << 1, type,
 		  t->mode_mask);
 }
 
@@ -742,13 +742,13 @@ static int tuner_resume(struct device *dev)
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver driver = {
-	.owner = THIS_MODULE,
-	.name = "tuner",
 	.id = I2C_DRIVERID_TUNER,
 	.attach_adapter = tuner_probe,
 	.detach_client = tuner_detach,
 	.command = tuner_command,
 	.driver = {
+		   .owner = THIS_MODULE,
+		   .name = "tuner",
 		   .suspend = tuner_suspend,
 		   .resume = tuner_resume,
 		   },
diff --git a/drivers/media/video/tvaudio.c b/drivers/media/video/tvaudio.c
index 4f1f339283e..30bb2a3615e 100644
--- a/drivers/media/video/tvaudio.c
+++ b/drivers/media/video/tvaudio.c
@@ -1702,8 +1702,10 @@ static int chip_command(struct i2c_client *client,
 
 
 static struct i2c_driver driver = {
-	.owner           = THIS_MODULE,
-	.name            = "generic i2c audio driver",
+	.driver = {
+		.owner   = THIS_MODULE,
+		.name    = "generic i2c audio driver",
+	},
 	.id              = I2C_DRIVERID_TVAUDIO,
 	.attach_adapter  = chip_probe,
 	.detach_client   = chip_detach,
diff --git a/drivers/media/video/tveeprom.c b/drivers/media/video/tveeprom.c
index d833b651073..d8b5a178180 100644
--- a/drivers/media/video/tveeprom.c
+++ b/drivers/media/video/tveeprom.c
@@ -778,8 +778,10 @@ tveeprom_detach_client (struct i2c_client *client)
 }
 
 static struct i2c_driver i2c_driver_tveeprom = {
-	.owner          = THIS_MODULE,
-	.name           = "tveeprom",
+	.driver = {
+		.owner  = THIS_MODULE,
+		.name   = "tveeprom",
+	},
 	.id             = I2C_DRIVERID_TVEEPROM,
 	.attach_adapter = tveeprom_attach_adapter,
 	.detach_client  = tveeprom_detach_client,
diff --git a/drivers/media/video/tvmixer.c b/drivers/media/video/tvmixer.c
index 936e01d2c78..5f4d0185476 100644
--- a/drivers/media/video/tvmixer.c
+++ b/drivers/media/video/tvmixer.c
@@ -228,9 +228,13 @@ static int tvmixer_release(struct inode *inode, struct file *file)
 
 static struct i2c_driver driver = {
 #ifdef I2C_PEC
-	.owner           = THIS_MODULE,
-#endif
+	.driver = {
+		.owner   = THIS_MODULE,
+		.name    = "tv card mixer driver",
+	},
+#else
 	.name            = "tv card mixer driver",
+#endif
 	.id              = I2C_DRIVERID_TVMIXER,
 	.detach_adapter  = tvmixer_adapters,
 	.attach_adapter  = tvmixer_adapters,
diff --git a/drivers/media/video/tvp5150.c b/drivers/media/video/tvp5150.c
index 3734554fc73..5eca71fa8cb 100644
--- a/drivers/media/video/tvp5150.c
+++ b/drivers/media/video/tvp5150.c
@@ -800,8 +800,10 @@ static int tvp5150_detach_client(struct i2c_client *client)
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver driver = {
-	.owner = THIS_MODULE,
-	.name = "tvp5150",
+	.driver = {
+		.owner = THIS_MODULE,
+		.name = "tvp5150",
+	},
 
 	/* FIXME */
 	.id = I2C_DRIVERID_SAA7110,
diff --git a/drivers/media/video/vpx3220.c b/drivers/media/video/vpx3220.c
index 54bc888c389..b85b5981fb8 100644
--- a/drivers/media/video/vpx3220.c
+++ b/drivers/media/video/vpx3220.c
@@ -721,8 +721,10 @@ vpx3220_attach_adapter (struct i2c_adapter *adapter)
  */
 
 static struct i2c_driver vpx3220_i2c_driver = {
-	.owner = THIS_MODULE,
-	.name = "vpx3220",
+	.driver = {
+		.owner = THIS_MODULE,
+		.name = "vpx3220",
+	},
 
 	.id = I2C_DRIVERID_VPX3220,
 
diff --git a/drivers/media/video/wm8775.c b/drivers/media/video/wm8775.c
index 527c2591749..22875f1fa1a 100644
--- a/drivers/media/video/wm8775.c
+++ b/drivers/media/video/wm8775.c
@@ -40,10 +40,10 @@ MODULE_AUTHOR("Ulf Eklund, Hans Verkuil");
 MODULE_LICENSE("GPL");
 
 #define wm8775_err(fmt, arg...) do { \
-	printk(KERN_ERR "%s %d-%04x: " fmt, client->driver->name, \
+	printk(KERN_ERR "%s %d-%04x: " fmt, client->driver->driver.name, \
 	       i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
 #define wm8775_info(fmt, arg...) do { \
-	printk(KERN_INFO "%s %d-%04x: " fmt, client->driver->name, \
+	printk(KERN_INFO "%s %d-%04x: " fmt, client->driver->driver.name, \
 	       i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
 
 
@@ -232,14 +232,16 @@ static int wm8775_detach(struct i2c_client *client)
 
 /* i2c implementation */
 static struct i2c_driver i2c_driver = {
-	.name = "wm8775",
+	.driver = {
+		.owner = THIS_MODULE,
+		.name = "wm8775",
+	},
 
 	.id = I2C_DRIVERID_WM8775,
 
 	.attach_adapter = wm8775_probe,
 	.detach_client = wm8775_detach,
 	.command = wm8775_command,
-	.owner = THIS_MODULE,
 };
 
 
diff --git a/drivers/media/video/zoran_driver.c b/drivers/media/video/zoran_driver.c
index 07bde9acd67..4034f1b4536 100644
--- a/drivers/media/video/zoran_driver.c
+++ b/drivers/media/video/zoran_driver.c
@@ -1311,7 +1311,7 @@ zoran_open (struct inode *inode,
 		res = -ENODEV;
 		goto open_unlock_and_return;
 	}
-	if (!try_module_get(zr->decoder->driver->owner)) {
+	if (!try_module_get(zr->decoder->driver->driver.owner)) {
 		dprintk(1,
 			KERN_ERR
 			"%s: failed to grab ownership of i2c decoder\n",
@@ -1321,13 +1321,13 @@ zoran_open (struct inode *inode,
 		goto open_unlock_and_return;
 	}
 	if (zr->encoder &&
-	    !try_module_get(zr->encoder->driver->owner)) {
+	    !try_module_get(zr->encoder->driver->driver.owner)) {
 		dprintk(1,
 			KERN_ERR
 			"%s: failed to grab ownership of i2c encoder\n",
 			ZR_DEVNAME(zr));
 		res = -EIO;
-		module_put(zr->decoder->driver->owner);
+		module_put(zr->decoder->driver->driver.owner);
 		module_put(THIS_MODULE);
 		goto open_unlock_and_return;
 	}
@@ -1393,9 +1393,9 @@ zoran_open (struct inode *inode,
 open_unlock_and_return:
 	/* if we grabbed locks, release them accordingly */
 	if (have_module_locks) {
-		module_put(zr->decoder->driver->owner);
+		module_put(zr->decoder->driver->driver.owner);
 		if (zr->encoder) {
-			module_put(zr->encoder->driver->owner);
+			module_put(zr->encoder->driver->driver.owner);
 		}
 		module_put(THIS_MODULE);
 	}
@@ -1461,9 +1461,9 @@ zoran_close (struct inode *inode,
 	kfree(fh);
 
 	/* release locks on the i2c modules */
-	module_put(zr->decoder->driver->owner);
+	module_put(zr->decoder->driver->driver.owner);
 	if (zr->encoder) {
-		 module_put(zr->encoder->driver->owner);
+		 module_put(zr->encoder->driver->driver.owner);
 	}
 	module_put(THIS_MODULE);
 
diff --git a/drivers/usb/media/w9968cf.c b/drivers/usb/media/w9968cf.c
index 04d69339c05..3605a6f3067 100644
--- a/drivers/usb/media/w9968cf.c
+++ b/drivers/usb/media/w9968cf.c
@@ -1533,12 +1533,12 @@ static int w9968cf_i2c_attach_inform(struct i2c_client* client)
 		}
 	} else {
 		DBG(4, "Rejected client [%s] with driver [%s]", 
-		    client->name, client->driver->name)
+		    client->name, client->driver->driver.name)
 		return -EINVAL;
 	}
 
 	DBG(5, "I2C attach client [%s] with driver [%s]",
-	    client->name, client->driver->name)
+	    client->name, client->driver->driver.name)
 
 	return 0;
 }
diff --git a/include/media/tuner.h b/include/media/tuner.h
index faa0f8e3091..b37cde60669 100644
--- a/include/media/tuner.h
+++ b/include/media/tuner.h
@@ -218,14 +218,15 @@ extern int default_tuner_init(struct i2c_client *c);
 extern int tea5767_autodetection(struct i2c_client *c);
 
 #define tuner_warn(fmt, arg...) do {\
-	printk(KERN_WARNING "%s %d-%04x: " fmt, t->i2c.driver->name, \
+	printk(KERN_WARNING "%s %d-%04x: " fmt, t->i2c.driver->driver.name, \
 			t->i2c.adapter->nr, t->i2c.addr , ##arg); } while (0)
 #define tuner_info(fmt, arg...) do {\
-	printk(KERN_INFO "%s %d-%04x: " fmt, t->i2c.driver->name, \
+	printk(KERN_INFO "%s %d-%04x: " fmt, t->i2c.driver->driver.name, \
 			t->i2c.adapter->nr, t->i2c.addr , ##arg); } while (0)
 #define tuner_dbg(fmt, arg...) do {\
 	if (tuner_debug) \
-		printk(KERN_DEBUG "%s %d-%04x: " fmt, t->i2c.driver->name, \
+		printk(KERN_DEBUG "%s %d-%04x: " fmt, \
+			t->i2c.driver->driver.name, \
 			t->i2c.adapter->nr, t->i2c.addr , ##arg); } while (0)
 
 #endif /* __KERNEL__ */
-- 
cgit v1.2.3-70-g09d2


From 2b48716d1d2f2edb1e7cbc5ecf1cb2cb39373e33 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Tue, 6 Dec 2005 15:33:15 -0800
Subject: [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>
---
 arch/arm/mach-pxa/akita-ioexp.c                | 1 -
 drivers/acorn/char/pcf8583.c                   | 1 -
 drivers/hwmon/adm1021.c                        | 1 -
 drivers/hwmon/adm1025.c                        | 1 -
 drivers/hwmon/adm1026.c                        | 1 -
 drivers/hwmon/adm1031.c                        | 1 -
 drivers/hwmon/adm9240.c                        | 1 -
 drivers/hwmon/asb100.c                         | 1 -
 drivers/hwmon/atxp1.c                          | 1 -
 drivers/hwmon/ds1621.c                         | 1 -
 drivers/hwmon/fscher.c                         | 1 -
 drivers/hwmon/fscpos.c                         | 1 -
 drivers/hwmon/gl518sm.c                        | 1 -
 drivers/hwmon/gl520sm.c                        | 1 -
 drivers/hwmon/it87.c                           | 2 --
 drivers/hwmon/lm63.c                           | 1 -
 drivers/hwmon/lm75.c                           | 1 -
 drivers/hwmon/lm77.c                           | 1 -
 drivers/hwmon/lm78.c                           | 2 --
 drivers/hwmon/lm80.c                           | 1 -
 drivers/hwmon/lm83.c                           | 1 -
 drivers/hwmon/lm85.c                           | 1 -
 drivers/hwmon/lm87.c                           | 1 -
 drivers/hwmon/lm90.c                           | 1 -
 drivers/hwmon/lm92.c                           | 1 -
 drivers/hwmon/max1619.c                        | 1 -
 drivers/hwmon/pc87360.c                        | 1 -
 drivers/hwmon/sis5595.c                        | 1 -
 drivers/hwmon/smsc47b397.c                     | 1 -
 drivers/hwmon/smsc47m1.c                       | 1 -
 drivers/hwmon/via686a.c                        | 1 -
 drivers/hwmon/vt8231.c                         | 1 -
 drivers/hwmon/w83627ehf.c                      | 1 -
 drivers/hwmon/w83627hf.c                       | 1 -
 drivers/hwmon/w83781d.c                        | 2 --
 drivers/hwmon/w83792d.c                        | 1 -
 drivers/hwmon/w83l785ts.c                      | 1 -
 drivers/i2c/chips/ds1337.c                     | 1 -
 drivers/i2c/chips/ds1374.c                     | 1 -
 drivers/i2c/chips/eeprom.c                     | 1 -
 drivers/i2c/chips/isp1301_omap.c               | 1 -
 drivers/i2c/chips/m41t00.c                     | 1 -
 drivers/i2c/chips/max6875.c                    | 1 -
 drivers/i2c/chips/pca9539.c                    | 1 -
 drivers/i2c/chips/pcf8574.c                    | 1 -
 drivers/i2c/chips/pcf8591.c                    | 1 -
 drivers/i2c/chips/rtc8564.c                    | 1 -
 drivers/i2c/chips/tps65010.c                   | 1 -
 drivers/i2c/chips/x1205.c                      | 1 -
 drivers/i2c/i2c-dev.c                          | 1 -
 drivers/macintosh/therm_adt746x.c              | 1 -
 drivers/macintosh/therm_pm72.c                 | 1 -
 drivers/macintosh/therm_windtunnel.c           | 1 -
 drivers/macintosh/windfarm_lm75_sensor.c       | 1 -
 drivers/media/video/adv7170.c                  | 1 -
 drivers/media/video/adv7175.c                  | 1 -
 drivers/media/video/bt819.c                    | 1 -
 drivers/media/video/bt832.c                    | 1 -
 drivers/media/video/bt856.c                    | 1 -
 drivers/media/video/cs53l32a.c                 | 1 -
 drivers/media/video/cx25840/cx25840-core.c     | 1 -
 drivers/media/video/indycam.c                  | 1 -
 drivers/media/video/ir-kbd-i2c.c               | 1 -
 drivers/media/video/msp3400.c                  | 1 -
 drivers/media/video/ovcamchip/ovcamchip_core.c | 1 -
 drivers/media/video/saa5246a.c                 | 1 -
 drivers/media/video/saa5249.c                  | 1 -
 drivers/media/video/saa6588.c                  | 1 -
 drivers/media/video/saa7110.c                  | 1 -
 drivers/media/video/saa7111.c                  | 1 -
 drivers/media/video/saa7114.c                  | 1 -
 drivers/media/video/saa7115.c                  | 1 -
 drivers/media/video/saa711x.c                  | 1 -
 drivers/media/video/saa7127.c                  | 1 -
 drivers/media/video/saa7134/saa6752hs.c        | 1 -
 drivers/media/video/saa7185.c                  | 1 -
 drivers/media/video/saa7191.c                  | 1 -
 drivers/media/video/tda7432.c                  | 1 -
 drivers/media/video/tda9840.c                  | 1 -
 drivers/media/video/tda9875.c                  | 1 -
 drivers/media/video/tda9887.c                  | 1 -
 drivers/media/video/tea6415c.c                 | 1 -
 drivers/media/video/tea6420.c                  | 1 -
 drivers/media/video/tuner-3036.c               | 1 -
 drivers/media/video/tuner-core.c               | 1 -
 drivers/media/video/tvaudio.c                  | 1 -
 drivers/media/video/tveeprom.c                 | 1 -
 drivers/media/video/tvmixer.c                  | 1 -
 drivers/media/video/tvp5150.c                  | 1 -
 drivers/media/video/vpx3220.c                  | 1 -
 drivers/media/video/wm8775.c                   | 1 -
 drivers/video/matrox/matroxfb_maven.c          | 1 -
 sound/oss/dmasound/dac3550a.c                  | 1 -
 sound/oss/dmasound/tas_common.c                | 1 -
 sound/ppc/keywest.c                            | 1 -
 95 files changed, 98 deletions(-)

(limited to 'drivers/media/video/tda9840.c')

diff --git a/arch/arm/mach-pxa/akita-ioexp.c b/arch/arm/mach-pxa/akita-ioexp.c
index 6f7b96551ad..1b398742ab5 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 5fc5940e637..9b49f316ae9 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 679cb92ccaf..665612729cb 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 3c70622c8cb..9331c56d2ba 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 92fac344d05..fefe6e74fd0 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 e42d75e2880..d0639796608 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 e60309e9726..5ddc22fea4a 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 3068de0dc72..ae9de63cf2e 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 ed152d93964..b0c490073c8 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 860094005c1..203f9c7abb2 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 982fff42ce9..25409181d1e 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 971146b92cc..6d0146b5702 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 9c5ca1f467a..9e685e3a3bc 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 a9a724a6f38..baee60e44b5 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 24d520bcc0b..29b74a880ea 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 35baae742cf..6b1aa7ef552 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 db35fbf4d25..74ca2c8c61c 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 177072056d7..a2f420d01fb 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 3af5b06995e..e404001e20d 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 1dc118f411a..c9a7cdea7bd 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 1c1744f699f..26dfa9e216c 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 b537c18c7a1..7389a012754 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 3152c006ce0..6ba34c302d8 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 ff7ba1e1bcc..5679464447c 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 b4e4a8409d0..b0c4cb730a7 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 1a50b13a62a..3abe330b22c 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 5469489c758..f161e88e3bb 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 9f44b93f326..8be5189d9bd 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 02e5d55a2e2..8663bbbe97f 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 b3051ad7b92..d1e3ec0fe4d 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 db75fbccfb6..cb01848729b 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 c2eb54b5207..d00a726d023 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 94538fb3ef1..12d79f5e490 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 2ffb84f9c6b..7ea441d4da6 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 fd1a59c5363..557114872f3 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 9018445ac1b..ff1c9f0abf9 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 fc9f202f296..f66c0cfdeda 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 a9d4ac770e3..93d483b8b77 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 3e3ebd82a42..0710b9da9d5 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 d0c9f291500..41116b7947f 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 9f1ec03e698..1251c7fc18d 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 92759b26fdc..2dc3d48375f 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 37051173d23..6d3ff584155 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 bb57faa6d5c..54b6e6a4bee 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 3d4d4d61876..c3e6449c448 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 8f41bb3a771..36cff09c678 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 6f567e2ee07..ceaa6b0bdfd 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 92947a6c7f1..e70b3db69ed 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 6880eabf138..245fffa92db 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 9715217a034..e140dd7d6a0 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 8bb1d857e14..02a3117ef92 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 97807be6422..cf72b782f60 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 259f19d5816..3d9dd2e166a 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 555d0e4eda1..fd16642d98a 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 c5f1c6b681b..e61003de1d5 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 33158aa734d..6d9536a71ee 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 5868bbb73a0..560b9989175 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 347eb711fc0..1c3ff5f38a6 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 207525aa156..60508069bbe 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 60484f93648..643ead1a87e 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 830d5195d1c..3b09f46dddf 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 96a808e8b2c..bb5cbecffcc 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 82c7f504265..3cc1d6a6019 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 3847d890d63..183253e2dd9 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 9ac398b2d91..428f1bb75ec 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 8c99edbe184..135c21479fc 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 5b346bdb1d5..d7c4e330cad 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 5ea36ee33b9..d60a783e047 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 58f60baa27e..619ff0b7a1f 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 946eb74db37..acaeee592b5 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 df53b58a9db..b7ac0122f72 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 6ac1ab4c980..29e28c742cd 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 3f7cfb7e46e..8008537391b 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 659cb8a0b21..bca6ed0e275 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 0e8c9ed62b1..4615a982ac6 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 64047d77388..f72a9f79620 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 a0f8eaf251e..41f6f05a043 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 59674d928ff..549c9929f10 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 8efc726874f..2a353d237c5 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 de896167029..9c3ecf7a0fe 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 081f4780515..7165a1b9625 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 e7e2213c39e..17046d974b7 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 74cc25f0405..3dc89d9a4e4 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 83257af8db4..d97f66804c3 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 e8c854948de..c13c7b95ef3 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 30bb2a3615e..0292c5abf14 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 d8b5a178180..8ac4cb82a45 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 5f4d0185476..e837f9f7fed 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 5eca71fa8cb..a60442ea4f9 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 b85b5981fb8..8dcee8b60e2 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 22875f1fa1a..bbfd55cd994 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 f6fdb69af0b..255875378a3 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 835e0cfc3bf..7360d8954d6 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 bd6910af286..81315996c0f 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 d532924b5a5..6058c2dd1b7 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,
-- 
cgit v1.2.3-70-g09d2