Commit 2b48716d authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

[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: default avatarGreg Kroah-Hartman <gregkh@suse.de>
Cc: Jean Delvare <khali@linux-fr.org>
parent de59cf9e
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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 */
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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 */
},
......
......@@ -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 */
},
......
......@@ -623,7 +623,6 @@ bt819_detach_client (struct i2c_client *client)
static struct i2c_driver i2c_driver_bt819 = {
.driver = {
.owner = THIS_MODULE,
.name = "bt819",
},
......
......@@ -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 */
......
......@@ -405,7 +405,6 @@ bt856_detach_client (struct i2c_client *client)
static struct i2c_driver i2c_driver_bt856 = {
.driver = {
.owner = THIS_MODULE,
.name = "bt856",
},
......
......@@ -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,
......
......@@ -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",
},
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,