diff options
author | Jean Delvare <khali@linux-fr.org> | 2007-10-13 17:56:29 -0400 |
---|---|---|
committer | Jean Delvare <khali@hyperion.delvare> | 2007-10-13 17:56:29 -0400 |
commit | cee37ae4071740cb190d1ac4ddb7aa77484aa7b3 (patch) | |
tree | 471c851f88788379878778ddb965c9561870acd9 | |
parent | c1f807efe8cc8ce93aae238e9da55adc41a4c2f2 (diff) |
i2c: Kill struct i2c_device_id
I2C devices do not have any form of ID as PCI or USB devices have.
No driver uses "MODULE_DEVICE_TABLE(i2c, ...)" because it doesn't
make sense. So we can get rid of struct i2c_device_id and the
associated support code.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Greg KH <greg@kroah.com>
-rw-r--r-- | include/linux/mod_devicetable.h | 5 | ||||
-rw-r--r-- | scripts/mod/file2alias.c | 11 |
2 files changed, 0 insertions, 16 deletions
diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h index 74523d999f7a..522b0dd836cf 100644 --- a/include/linux/mod_devicetable.h +++ b/include/linux/mod_devicetable.h | |||
@@ -262,11 +262,6 @@ struct pcmcia_device_id { | |||
262 | #define PCMCIA_DEV_ID_MATCH_FAKE_CIS 0x0200 | 262 | #define PCMCIA_DEV_ID_MATCH_FAKE_CIS 0x0200 |
263 | #define PCMCIA_DEV_ID_MATCH_ANONYMOUS 0x0400 | 263 | #define PCMCIA_DEV_ID_MATCH_ANONYMOUS 0x0400 |
264 | 264 | ||
265 | /* I2C */ | ||
266 | struct i2c_device_id { | ||
267 | __u16 id; | ||
268 | }; | ||
269 | |||
270 | /* Input */ | 265 | /* Input */ |
271 | #define INPUT_DEVICE_ID_EV_MAX 0x1f | 266 | #define INPUT_DEVICE_ID_EV_MAX 0x1f |
272 | #define INPUT_DEVICE_ID_KEY_MIN_INTERESTING 0x71 | 267 | #define INPUT_DEVICE_ID_KEY_MIN_INTERESTING 0x71 |
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c index 36e3754db53a..494435ca88fa 100644 --- a/scripts/mod/file2alias.c +++ b/scripts/mod/file2alias.c | |||
@@ -396,13 +396,6 @@ static int do_vio_entry(const char *filename, struct vio_device_id *vio, | |||
396 | return 1; | 396 | return 1; |
397 | } | 397 | } |
398 | 398 | ||
399 | static int do_i2c_entry(const char *filename, struct i2c_device_id *i2c, char *alias) | ||
400 | { | ||
401 | strcpy(alias, "i2c:"); | ||
402 | ADD(alias, "id", 1, i2c->id); | ||
403 | return 1; | ||
404 | } | ||
405 | |||
406 | #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) | 399 | #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) |
407 | 400 | ||
408 | static void do_input(char *alias, | 401 | static void do_input(char *alias, |
@@ -613,10 +606,6 @@ void handle_moddevtable(struct module *mod, struct elf_info *info, | |||
613 | do_table(symval, sym->st_size, | 606 | do_table(symval, sym->st_size, |
614 | sizeof(struct vio_device_id), "vio", | 607 | sizeof(struct vio_device_id), "vio", |
615 | do_vio_entry, mod); | 608 | do_vio_entry, mod); |
616 | else if (sym_is(symname, "__mod_i2c_device_table")) | ||
617 | do_table(symval, sym->st_size, | ||
618 | sizeof(struct i2c_device_id), "i2c", | ||
619 | do_i2c_entry, mod); | ||
620 | else if (sym_is(symname, "__mod_input_device_table")) | 609 | else if (sym_is(symname, "__mod_input_device_table")) |
621 | do_table(symval, sym->st_size, | 610 | do_table(symval, sym->st_size, |
622 | sizeof(struct input_device_id), "input", | 611 | sizeof(struct input_device_id), "input", |