diff options
author | Jean Delvare <khali@linux-fr.org> | 2008-04-29 17:11:40 -0400 |
---|---|---|
committer | Jean Delvare <khali@hyperion.delvare> | 2008-04-29 17:11:40 -0400 |
commit | 3760f736716f74bdc62a4ba5406934338da93eb2 (patch) | |
tree | e28e22c6655dd62566f1b7a99f9354a31bf9d06e /drivers/gpio | |
parent | d2653e92732bd3911feff6bee5e23dbf959381db (diff) |
i2c: Convert most new-style drivers to use module aliasing
Based on earlier work by Jon Smirl and Jochen Friedrich.
Update most new-style i2c drivers to use standard module aliasing
instead of the old driver_name/type driver matching scheme. I've
left the video drivers apart (except for SoC camera drivers) as
they're a bit more diffcult to deal with, they'll have their own
patch later.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Jon Smirl <jonsmirl@gmail.com>
Cc: Jochen Friedrich <jochen@scram.de>
Diffstat (limited to 'drivers/gpio')
-rw-r--r-- | drivers/gpio/pca953x.c | 23 | ||||
-rw-r--r-- | drivers/gpio/pcf857x.c | 33 |
2 files changed, 24 insertions, 32 deletions
diff --git a/drivers/gpio/pca953x.c b/drivers/gpio/pca953x.c index 2670519236e5..5a99e81d2784 100644 --- a/drivers/gpio/pca953x.c +++ b/drivers/gpio/pca953x.c | |||
@@ -23,13 +23,7 @@ | |||
23 | #define PCA953X_INVERT 2 | 23 | #define PCA953X_INVERT 2 |
24 | #define PCA953X_DIRECTION 3 | 24 | #define PCA953X_DIRECTION 3 |
25 | 25 | ||
26 | /* This is temporary - in 2.6.26 i2c_driver_data should replace it. */ | 26 | static const struct i2c_device_id pca953x_id[] = { |
27 | struct pca953x_desc { | ||
28 | char name[I2C_NAME_SIZE]; | ||
29 | unsigned long driver_data; | ||
30 | }; | ||
31 | |||
32 | static const struct pca953x_desc pca953x_descs[] = { | ||
33 | { "pca9534", 8, }, | 27 | { "pca9534", 8, }, |
34 | { "pca9535", 16, }, | 28 | { "pca9535", 16, }, |
35 | { "pca9536", 4, }, | 29 | { "pca9536", 4, }, |
@@ -37,7 +31,9 @@ static const struct pca953x_desc pca953x_descs[] = { | |||
37 | { "pca9538", 8, }, | 31 | { "pca9538", 8, }, |
38 | { "pca9539", 16, }, | 32 | { "pca9539", 16, }, |
39 | /* REVISIT several pca955x parts should work here too */ | 33 | /* REVISIT several pca955x parts should work here too */ |
34 | { } | ||
40 | }; | 35 | }; |
36 | MODULE_DEVICE_TABLE(i2c, pca953x_id); | ||
41 | 37 | ||
42 | struct pca953x_chip { | 38 | struct pca953x_chip { |
43 | unsigned gpio_start; | 39 | unsigned gpio_start; |
@@ -193,26 +189,16 @@ static void pca953x_setup_gpio(struct pca953x_chip *chip, int gpios) | |||
193 | } | 189 | } |
194 | 190 | ||
195 | static int __devinit pca953x_probe(struct i2c_client *client, | 191 | static int __devinit pca953x_probe(struct i2c_client *client, |
196 | const struct i2c_device_id *did) | 192 | const struct i2c_device_id *id) |
197 | { | 193 | { |
198 | struct pca953x_platform_data *pdata; | 194 | struct pca953x_platform_data *pdata; |
199 | struct pca953x_chip *chip; | 195 | struct pca953x_chip *chip; |
200 | int ret, i; | 196 | int ret, i; |
201 | const struct pca953x_desc *id = NULL; | ||
202 | 197 | ||
203 | pdata = client->dev.platform_data; | 198 | pdata = client->dev.platform_data; |
204 | if (pdata == NULL) | 199 | if (pdata == NULL) |
205 | return -ENODEV; | 200 | return -ENODEV; |
206 | 201 | ||
207 | /* this loop vanishes when we get i2c_device_id */ | ||
208 | for (i = 0; i < ARRAY_SIZE(pca953x_descs); i++) | ||
209 | if (!strcmp(pca953x_descs[i].name, client->name)) { | ||
210 | id = pca953x_descs + i; | ||
211 | break; | ||
212 | } | ||
213 | if (!id) | ||
214 | return -ENODEV; | ||
215 | |||
216 | chip = kzalloc(sizeof(struct pca953x_chip), GFP_KERNEL); | 202 | chip = kzalloc(sizeof(struct pca953x_chip), GFP_KERNEL); |
217 | if (chip == NULL) | 203 | if (chip == NULL) |
218 | return -ENOMEM; | 204 | return -ENOMEM; |
@@ -292,6 +278,7 @@ static struct i2c_driver pca953x_driver = { | |||
292 | }, | 278 | }, |
293 | .probe = pca953x_probe, | 279 | .probe = pca953x_probe, |
294 | .remove = pca953x_remove, | 280 | .remove = pca953x_remove, |
281 | .id_table = pca953x_id, | ||
295 | }; | 282 | }; |
296 | 283 | ||
297 | static int __init pca953x_init(void) | 284 | static int __init pca953x_init(void) |
diff --git a/drivers/gpio/pcf857x.c b/drivers/gpio/pcf857x.c index 8856870dd738..aa6cc8b2a2bc 100644 --- a/drivers/gpio/pcf857x.c +++ b/drivers/gpio/pcf857x.c | |||
@@ -26,6 +26,21 @@ | |||
26 | #include <asm/gpio.h> | 26 | #include <asm/gpio.h> |
27 | 27 | ||
28 | 28 | ||
29 | static const struct i2c_device_id pcf857x_id[] = { | ||
30 | { "pcf8574", 8 }, | ||
31 | { "pca8574", 8 }, | ||
32 | { "pca9670", 8 }, | ||
33 | { "pca9672", 8 }, | ||
34 | { "pca9674", 8 }, | ||
35 | { "pcf8575", 16 }, | ||
36 | { "pca8575", 16 }, | ||
37 | { "pca9671", 16 }, | ||
38 | { "pca9673", 16 }, | ||
39 | { "pca9675", 16 }, | ||
40 | { } | ||
41 | }; | ||
42 | MODULE_DEVICE_TABLE(i2c, pcf857x_id); | ||
43 | |||
29 | /* | 44 | /* |
30 | * The pcf857x, pca857x, and pca967x chips only expose one read and one | 45 | * The pcf857x, pca857x, and pca967x chips only expose one read and one |
31 | * write register. Writing a "one" bit (to match the reset state) lets | 46 | * write register. Writing a "one" bit (to match the reset state) lets |
@@ -173,13 +188,8 @@ static int pcf857x_probe(struct i2c_client *client, | |||
173 | * | 188 | * |
174 | * NOTE: we don't distinguish here between *4 and *4a parts. | 189 | * NOTE: we don't distinguish here between *4 and *4a parts. |
175 | */ | 190 | */ |
176 | if (strcmp(client->name, "pcf8574") == 0 | 191 | gpio->chip.ngpio = id->driver_data; |
177 | || strcmp(client->name, "pca8574") == 0 | 192 | if (gpio->chip.ngpio == 8) { |
178 | || strcmp(client->name, "pca9670") == 0 | ||
179 | || strcmp(client->name, "pca9672") == 0 | ||
180 | || strcmp(client->name, "pca9674") == 0 | ||
181 | ) { | ||
182 | gpio->chip.ngpio = 8; | ||
183 | gpio->chip.direction_input = pcf857x_input8; | 193 | gpio->chip.direction_input = pcf857x_input8; |
184 | gpio->chip.get = pcf857x_get8; | 194 | gpio->chip.get = pcf857x_get8; |
185 | gpio->chip.direction_output = pcf857x_output8; | 195 | gpio->chip.direction_output = pcf857x_output8; |
@@ -199,13 +209,7 @@ static int pcf857x_probe(struct i2c_client *client, | |||
199 | * | 209 | * |
200 | * NOTE: we don't distinguish here between '75 and '75c parts. | 210 | * NOTE: we don't distinguish here between '75 and '75c parts. |
201 | */ | 211 | */ |
202 | } else if (strcmp(client->name, "pcf8575") == 0 | 212 | } else if (gpio->chip.ngpio == 16) { |
203 | || strcmp(client->name, "pca8575") == 0 | ||
204 | || strcmp(client->name, "pca9671") == 0 | ||
205 | || strcmp(client->name, "pca9673") == 0 | ||
206 | || strcmp(client->name, "pca9675") == 0 | ||
207 | ) { | ||
208 | gpio->chip.ngpio = 16; | ||
209 | gpio->chip.direction_input = pcf857x_input16; | 213 | gpio->chip.direction_input = pcf857x_input16; |
210 | gpio->chip.get = pcf857x_get16; | 214 | gpio->chip.get = pcf857x_get16; |
211 | gpio->chip.direction_output = pcf857x_output16; | 215 | gpio->chip.direction_output = pcf857x_output16; |
@@ -314,6 +318,7 @@ static struct i2c_driver pcf857x_driver = { | |||
314 | }, | 318 | }, |
315 | .probe = pcf857x_probe, | 319 | .probe = pcf857x_probe, |
316 | .remove = pcf857x_remove, | 320 | .remove = pcf857x_remove, |
321 | .id_table = pcf857x_id, | ||
317 | }; | 322 | }; |
318 | 323 | ||
319 | static int __init pcf857x_init(void) | 324 | static int __init pcf857x_init(void) |