aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/i2c
diff options
context:
space:
mode:
authorLaurent Riffard <laurent.riffard@free.fr>2005-11-26 14:36:00 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2006-01-06 01:16:23 -0500
commita9718b0c1154dcbd955be6aaee47a314cde6a25a (patch)
tree5bc275f56d94649477e24f5d2ac03d211a41723f /drivers/i2c
parent35d8b2e6b8e86b0d5126f36613b5202d4eb978b6 (diff)
[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>
Diffstat (limited to 'drivers/i2c')
-rw-r--r--drivers/i2c/chips/ds1337.c6
-rw-r--r--drivers/i2c/chips/ds1374.c6
-rw-r--r--drivers/i2c/chips/eeprom.c6
-rw-r--r--drivers/i2c/chips/isp1301_omap.c6
-rw-r--r--drivers/i2c/chips/m41t00.c6
-rw-r--r--drivers/i2c/chips/max6875.c6
-rw-r--r--drivers/i2c/chips/pca9539.c6
-rw-r--r--drivers/i2c/chips/pcf8574.c6
-rw-r--r--drivers/i2c/chips/pcf8591.c6
-rw-r--r--drivers/i2c/chips/rtc8564.c6
-rw-r--r--drivers/i2c/chips/tps65010.c6
-rw-r--r--drivers/i2c/chips/x1205.c6
12 files changed, 48 insertions, 24 deletions
diff --git a/drivers/i2c/chips/ds1337.c b/drivers/i2c/chips/ds1337.c
index 65146cbc8390..a9d4ac770e39 100644
--- a/drivers/i2c/chips/ds1337.c
+++ b/drivers/i2c/chips/ds1337.c
@@ -52,8 +52,10 @@ static int ds1337_command(struct i2c_client *client, unsigned int cmd,
52 * Driver data (common to all clients) 52 * Driver data (common to all clients)
53 */ 53 */
54static struct i2c_driver ds1337_driver = { 54static struct i2c_driver ds1337_driver = {
55 .owner = THIS_MODULE, 55 .driver = {
56 .name = "ds1337", 56 .owner = THIS_MODULE,
57 .name = "ds1337",
58 },
57 .attach_adapter = ds1337_attach_adapter, 59 .attach_adapter = ds1337_attach_adapter,
58 .detach_client = ds1337_detach_client, 60 .detach_client = ds1337_detach_client,
59 .command = ds1337_command, 61 .command = ds1337_command,
diff --git a/drivers/i2c/chips/ds1374.c b/drivers/i2c/chips/ds1374.c
index 5a270d60b699..3e3ebd82a423 100644
--- a/drivers/i2c/chips/ds1374.c
+++ b/drivers/i2c/chips/ds1374.c
@@ -232,8 +232,10 @@ static int ds1374_detach(struct i2c_client *client)
232} 232}
233 233
234static struct i2c_driver ds1374_driver = { 234static struct i2c_driver ds1374_driver = {
235 .owner = THIS_MODULE, 235 .driver = {
236 .name = DS1374_DRV_NAME, 236 .owner = THIS_MODULE,
237 .name = DS1374_DRV_NAME,
238 },
237 .id = I2C_DRIVERID_DS1374, 239 .id = I2C_DRIVERID_DS1374,
238 .attach_adapter = ds1374_attach, 240 .attach_adapter = ds1374_attach,
239 .detach_client = ds1374_detach, 241 .detach_client = ds1374_detach,
diff --git a/drivers/i2c/chips/eeprom.c b/drivers/i2c/chips/eeprom.c
index 9bb1f8b3f38c..d0c9f291500b 100644
--- a/drivers/i2c/chips/eeprom.c
+++ b/drivers/i2c/chips/eeprom.c
@@ -68,8 +68,10 @@ static int eeprom_detach_client(struct i2c_client *client);
68 68
69/* This is the driver that will be inserted */ 69/* This is the driver that will be inserted */
70static struct i2c_driver eeprom_driver = { 70static struct i2c_driver eeprom_driver = {
71 .owner = THIS_MODULE, 71 .driver = {
72 .name = "eeprom", 72 .owner = THIS_MODULE,
73 .name = "eeprom",
74 },
73 .id = I2C_DRIVERID_EEPROM, 75 .id = I2C_DRIVERID_EEPROM,
74 .attach_adapter = eeprom_attach_adapter, 76 .attach_adapter = eeprom_attach_adapter,
75 .detach_client = eeprom_detach_client, 77 .detach_client = eeprom_detach_client,
diff --git a/drivers/i2c/chips/isp1301_omap.c b/drivers/i2c/chips/isp1301_omap.c
index 4f472ba66a02..9f1ec03e698d 100644
--- a/drivers/i2c/chips/isp1301_omap.c
+++ b/drivers/i2c/chips/isp1301_omap.c
@@ -1632,8 +1632,10 @@ static int isp1301_scan_bus(struct i2c_adapter *bus)
1632} 1632}
1633 1633
1634static struct i2c_driver isp1301_driver = { 1634static struct i2c_driver isp1301_driver = {
1635 .owner = THIS_MODULE, 1635 .driver = {
1636 .name = "isp1301_omap", 1636 .owner = THIS_MODULE,
1637 .name = "isp1301_omap",
1638 },
1637 .id = 1301, /* FIXME "official", i2c-ids.h */ 1639 .id = 1301, /* FIXME "official", i2c-ids.h */
1638 .class = I2C_CLASS_HWMON, 1640 .class = I2C_CLASS_HWMON,
1639 .attach_adapter = isp1301_scan_bus, 1641 .attach_adapter = isp1301_scan_bus,
diff --git a/drivers/i2c/chips/m41t00.c b/drivers/i2c/chips/m41t00.c
index 13e67836b348..92759b26fdcf 100644
--- a/drivers/i2c/chips/m41t00.c
+++ b/drivers/i2c/chips/m41t00.c
@@ -211,8 +211,10 @@ m41t00_detach(struct i2c_client *client)
211} 211}
212 212
213static struct i2c_driver m41t00_driver = { 213static struct i2c_driver m41t00_driver = {
214 .owner = THIS_MODULE, 214 .driver = {
215 .name = M41T00_DRV_NAME, 215 .owner = THIS_MODULE,
216 .name = M41T00_DRV_NAME,
217 },
216 .id = I2C_DRIVERID_STM41T00, 218 .id = I2C_DRIVERID_STM41T00,
217 .attach_adapter = m41t00_attach, 219 .attach_adapter = m41t00_attach,
218 .detach_client = m41t00_detach, 220 .detach_client = m41t00_detach,
diff --git a/drivers/i2c/chips/max6875.c b/drivers/i2c/chips/max6875.c
index 7e61019e72dd..37051173d233 100644
--- a/drivers/i2c/chips/max6875.c
+++ b/drivers/i2c/chips/max6875.c
@@ -67,8 +67,10 @@ static int max6875_detach_client(struct i2c_client *client);
67 67
68/* This is the driver that will be inserted */ 68/* This is the driver that will be inserted */
69static struct i2c_driver max6875_driver = { 69static struct i2c_driver max6875_driver = {
70 .owner = THIS_MODULE, 70 .driver = {
71 .name = "max6875", 71 .owner = THIS_MODULE,
72 .name = "max6875",
73 },
72 .attach_adapter = max6875_attach_adapter, 74 .attach_adapter = max6875_attach_adapter,
73 .detach_client = max6875_detach_client, 75 .detach_client = max6875_detach_client,
74}; 76};
diff --git a/drivers/i2c/chips/pca9539.c b/drivers/i2c/chips/pca9539.c
index 26feb7a4f942..bb57faa6d5c1 100644
--- a/drivers/i2c/chips/pca9539.c
+++ b/drivers/i2c/chips/pca9539.c
@@ -38,8 +38,10 @@ static int pca9539_detach_client(struct i2c_client *client);
38 38
39/* This is the driver that will be inserted */ 39/* This is the driver that will be inserted */
40static struct i2c_driver pca9539_driver = { 40static struct i2c_driver pca9539_driver = {
41 .owner = THIS_MODULE, 41 .driver = {
42 .name = "pca9539", 42 .owner = THIS_MODULE,
43 .name = "pca9539",
44 },
43 .attach_adapter = pca9539_attach_adapter, 45 .attach_adapter = pca9539_attach_adapter,
44 .detach_client = pca9539_detach_client, 46 .detach_client = pca9539_detach_client,
45}; 47};
diff --git a/drivers/i2c/chips/pcf8574.c b/drivers/i2c/chips/pcf8574.c
index 2fae640cf329..3d4d4d61876b 100644
--- a/drivers/i2c/chips/pcf8574.c
+++ b/drivers/i2c/chips/pcf8574.c
@@ -65,8 +65,10 @@ static void pcf8574_init_client(struct i2c_client *client);
65 65
66/* This is the driver that will be inserted */ 66/* This is the driver that will be inserted */
67static struct i2c_driver pcf8574_driver = { 67static struct i2c_driver pcf8574_driver = {
68 .owner = THIS_MODULE, 68 .driver = {
69 .name = "pcf8574", 69 .owner = THIS_MODULE,
70 .name = "pcf8574",
71 },
70 .id = I2C_DRIVERID_PCF8574, 72 .id = I2C_DRIVERID_PCF8574,
71 .attach_adapter = pcf8574_attach_adapter, 73 .attach_adapter = pcf8574_attach_adapter,
72 .detach_client = pcf8574_detach_client, 74 .detach_client = pcf8574_detach_client,
diff --git a/drivers/i2c/chips/pcf8591.c b/drivers/i2c/chips/pcf8591.c
index 8750f71278e1..8f41bb3a771c 100644
--- a/drivers/i2c/chips/pcf8591.c
+++ b/drivers/i2c/chips/pcf8591.c
@@ -88,8 +88,10 @@ static int pcf8591_read_channel(struct device *dev, int channel);
88 88
89/* This is the driver that will be inserted */ 89/* This is the driver that will be inserted */
90static struct i2c_driver pcf8591_driver = { 90static struct i2c_driver pcf8591_driver = {
91 .owner = THIS_MODULE, 91 .driver = {
92 .name = "pcf8591", 92 .owner = THIS_MODULE,
93 .name = "pcf8591",
94 },
93 .id = I2C_DRIVERID_PCF8591, 95 .id = I2C_DRIVERID_PCF8591,
94 .attach_adapter = pcf8591_attach_adapter, 96 .attach_adapter = pcf8591_attach_adapter,
95 .detach_client = pcf8591_detach_client, 97 .detach_client = pcf8591_detach_client,
diff --git a/drivers/i2c/chips/rtc8564.c b/drivers/i2c/chips/rtc8564.c
index 07494d394381..6f567e2ee073 100644
--- a/drivers/i2c/chips/rtc8564.c
+++ b/drivers/i2c/chips/rtc8564.c
@@ -358,8 +358,10 @@ rtc8564_command(struct i2c_client *client, unsigned int cmd, void *arg)
358} 358}
359 359
360static struct i2c_driver rtc8564_driver = { 360static struct i2c_driver rtc8564_driver = {
361 .owner = THIS_MODULE, 361 .driver = {
362 .name = "RTC8564", 362 .owner = THIS_MODULE,
363 .name = "RTC8564",
364 },
363 .id = I2C_DRIVERID_RTC8564, 365 .id = I2C_DRIVERID_RTC8564,
364 .attach_adapter = rtc8564_probe, 366 .attach_adapter = rtc8564_probe,
365 .detach_client = rtc8564_detach, 367 .detach_client = rtc8564_detach,
diff --git a/drivers/i2c/chips/tps65010.c b/drivers/i2c/chips/tps65010.c
index 439bf6ceb789..92947a6c7f1f 100644
--- a/drivers/i2c/chips/tps65010.c
+++ b/drivers/i2c/chips/tps65010.c
@@ -637,8 +637,10 @@ static int __init tps65010_scan_bus(struct i2c_adapter *bus)
637} 637}
638 638
639static struct i2c_driver tps65010_driver = { 639static struct i2c_driver tps65010_driver = {
640 .owner = THIS_MODULE, 640 .driver = {
641 .name = "tps65010", 641 .owner = THIS_MODULE,
642 .name = "tps65010",
643 },
642 .attach_adapter = tps65010_scan_bus, 644 .attach_adapter = tps65010_scan_bus,
643 .detach_client = __exit_p(tps65010_detach_client), 645 .detach_client = __exit_p(tps65010_detach_client),
644}; 646};
diff --git a/drivers/i2c/chips/x1205.c b/drivers/i2c/chips/x1205.c
index c5ff2cee15ae..6880eabf1380 100644
--- a/drivers/i2c/chips/x1205.c
+++ b/drivers/i2c/chips/x1205.c
@@ -105,8 +105,10 @@ static int x1205_command(struct i2c_client *client, unsigned int cmd,
105 void *arg); 105 void *arg);
106 106
107static struct i2c_driver x1205_driver = { 107static struct i2c_driver x1205_driver = {
108 .owner = THIS_MODULE, 108 .driver = {
109 .name = "x1205", 109 .owner = THIS_MODULE,
110 .name = "x1205",
111 },
110 .attach_adapter = &x1205_attach, 112 .attach_adapter = &x1205_attach,
111 .detach_client = &x1205_detach, 113 .detach_client = &x1205_detach,
112}; 114};