mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 16:29:59 +00:00
[PATCH] i2c: Drop i2c_driver.{owner,name}, 2 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 miscellaneaous i2c chip 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>
This commit is contained in:
parent
35d8b2e6b8
commit
a9718b0c11
12 changed files with 48 additions and 24 deletions
|
@ -52,8 +52,10 @@ static int ds1337_command(struct i2c_client *client, unsigned int cmd,
|
|||
* Driver data (common to all clients)
|
||||
*/
|
||||
static struct i2c_driver ds1337_driver = {
|
||||
.owner = THIS_MODULE,
|
||||
.name = "ds1337",
|
||||
.driver = {
|
||||
.owner = THIS_MODULE,
|
||||
.name = "ds1337",
|
||||
},
|
||||
.attach_adapter = ds1337_attach_adapter,
|
||||
.detach_client = ds1337_detach_client,
|
||||
.command = ds1337_command,
|
||||
|
|
|
@ -232,8 +232,10 @@ static int ds1374_detach(struct i2c_client *client)
|
|||
}
|
||||
|
||||
static struct i2c_driver ds1374_driver = {
|
||||
.owner = THIS_MODULE,
|
||||
.name = DS1374_DRV_NAME,
|
||||
.driver = {
|
||||
.owner = THIS_MODULE,
|
||||
.name = DS1374_DRV_NAME,
|
||||
},
|
||||
.id = I2C_DRIVERID_DS1374,
|
||||
.attach_adapter = ds1374_attach,
|
||||
.detach_client = ds1374_detach,
|
||||
|
|
|
@ -68,8 +68,10 @@ static int eeprom_detach_client(struct i2c_client *client);
|
|||
|
||||
/* This is the driver that will be inserted */
|
||||
static struct i2c_driver eeprom_driver = {
|
||||
.owner = THIS_MODULE,
|
||||
.name = "eeprom",
|
||||
.driver = {
|
||||
.owner = THIS_MODULE,
|
||||
.name = "eeprom",
|
||||
},
|
||||
.id = I2C_DRIVERID_EEPROM,
|
||||
.attach_adapter = eeprom_attach_adapter,
|
||||
.detach_client = eeprom_detach_client,
|
||||
|
|
|
@ -1632,8 +1632,10 @@ static int isp1301_scan_bus(struct i2c_adapter *bus)
|
|||
}
|
||||
|
||||
static struct i2c_driver isp1301_driver = {
|
||||
.owner = THIS_MODULE,
|
||||
.name = "isp1301_omap",
|
||||
.driver = {
|
||||
.owner = THIS_MODULE,
|
||||
.name = "isp1301_omap",
|
||||
},
|
||||
.id = 1301, /* FIXME "official", i2c-ids.h */
|
||||
.class = I2C_CLASS_HWMON,
|
||||
.attach_adapter = isp1301_scan_bus,
|
||||
|
|
|
@ -211,8 +211,10 @@ m41t00_detach(struct i2c_client *client)
|
|||
}
|
||||
|
||||
static struct i2c_driver m41t00_driver = {
|
||||
.owner = THIS_MODULE,
|
||||
.name = M41T00_DRV_NAME,
|
||||
.driver = {
|
||||
.owner = THIS_MODULE,
|
||||
.name = M41T00_DRV_NAME,
|
||||
},
|
||||
.id = I2C_DRIVERID_STM41T00,
|
||||
.attach_adapter = m41t00_attach,
|
||||
.detach_client = m41t00_detach,
|
||||
|
|
|
@ -67,8 +67,10 @@ static int max6875_detach_client(struct i2c_client *client);
|
|||
|
||||
/* This is the driver that will be inserted */
|
||||
static struct i2c_driver max6875_driver = {
|
||||
.owner = THIS_MODULE,
|
||||
.name = "max6875",
|
||||
.driver = {
|
||||
.owner = THIS_MODULE,
|
||||
.name = "max6875",
|
||||
},
|
||||
.attach_adapter = max6875_attach_adapter,
|
||||
.detach_client = max6875_detach_client,
|
||||
};
|
||||
|
|
|
@ -38,8 +38,10 @@ static int pca9539_detach_client(struct i2c_client *client);
|
|||
|
||||
/* This is the driver that will be inserted */
|
||||
static struct i2c_driver pca9539_driver = {
|
||||
.owner = THIS_MODULE,
|
||||
.name = "pca9539",
|
||||
.driver = {
|
||||
.owner = THIS_MODULE,
|
||||
.name = "pca9539",
|
||||
},
|
||||
.attach_adapter = pca9539_attach_adapter,
|
||||
.detach_client = pca9539_detach_client,
|
||||
};
|
||||
|
|
|
@ -65,8 +65,10 @@ static void pcf8574_init_client(struct i2c_client *client);
|
|||
|
||||
/* This is the driver that will be inserted */
|
||||
static struct i2c_driver pcf8574_driver = {
|
||||
.owner = THIS_MODULE,
|
||||
.name = "pcf8574",
|
||||
.driver = {
|
||||
.owner = THIS_MODULE,
|
||||
.name = "pcf8574",
|
||||
},
|
||||
.id = I2C_DRIVERID_PCF8574,
|
||||
.attach_adapter = pcf8574_attach_adapter,
|
||||
.detach_client = pcf8574_detach_client,
|
||||
|
|
|
@ -88,8 +88,10 @@ static int pcf8591_read_channel(struct device *dev, int channel);
|
|||
|
||||
/* This is the driver that will be inserted */
|
||||
static struct i2c_driver pcf8591_driver = {
|
||||
.owner = THIS_MODULE,
|
||||
.name = "pcf8591",
|
||||
.driver = {
|
||||
.owner = THIS_MODULE,
|
||||
.name = "pcf8591",
|
||||
},
|
||||
.id = I2C_DRIVERID_PCF8591,
|
||||
.attach_adapter = pcf8591_attach_adapter,
|
||||
.detach_client = pcf8591_detach_client,
|
||||
|
|
|
@ -358,8 +358,10 @@ rtc8564_command(struct i2c_client *client, unsigned int cmd, void *arg)
|
|||
}
|
||||
|
||||
static struct i2c_driver rtc8564_driver = {
|
||||
.owner = THIS_MODULE,
|
||||
.name = "RTC8564",
|
||||
.driver = {
|
||||
.owner = THIS_MODULE,
|
||||
.name = "RTC8564",
|
||||
},
|
||||
.id = I2C_DRIVERID_RTC8564,
|
||||
.attach_adapter = rtc8564_probe,
|
||||
.detach_client = rtc8564_detach,
|
||||
|
|
|
@ -637,8 +637,10 @@ static int __init tps65010_scan_bus(struct i2c_adapter *bus)
|
|||
}
|
||||
|
||||
static struct i2c_driver tps65010_driver = {
|
||||
.owner = THIS_MODULE,
|
||||
.name = "tps65010",
|
||||
.driver = {
|
||||
.owner = THIS_MODULE,
|
||||
.name = "tps65010",
|
||||
},
|
||||
.attach_adapter = tps65010_scan_bus,
|
||||
.detach_client = __exit_p(tps65010_detach_client),
|
||||
};
|
||||
|
|
|
@ -105,8 +105,10 @@ static int x1205_command(struct i2c_client *client, unsigned int cmd,
|
|||
void *arg);
|
||||
|
||||
static struct i2c_driver x1205_driver = {
|
||||
.owner = THIS_MODULE,
|
||||
.name = "x1205",
|
||||
.driver = {
|
||||
.owner = THIS_MODULE,
|
||||
.name = "x1205",
|
||||
},
|
||||
.attach_adapter = &x1205_attach,
|
||||
.detach_client = &x1205_detach,
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue