[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>

37 files changed, 0 insertions, 37 deletions

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",
         },