diff options
author | Pavel Roskin <proski@gnu.org> | 2005-07-07 20:59:03 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-07 21:24:06 -0400 |
commit | a00db1ba7c33619cbd7c3153e4746d15881c0383 (patch) | |
tree | 5cb3bbbd8b9fd03947c75b7bdfede1db27c9d6b6 /include/pcmcia/ds.h | |
parent | 2bc5a9bdc56fac6f7cbf95b89443e3809141c247 (diff) |
[PATCH] pcmcia: remove client services version
The Linux PCMCIA code has some data that was apparently used (or meant to be
used) to ensure that only proper client drivers are loaded. This is now
ensured (to a certain degree) by the fact that the most client drivers are
part of the kernel. Also, the version information has not been updated
despite major changes in PCMCIA API. This has made it meaningless.
This patch removes servinfo_t and pcmcia_get_card_services_info. They are not
used in any userspace utilities such as pcmcia-cs and pcmciautils.
drivers/pcmcia/pcmcia_ioctl.c is adjusted accordingly.
CS_RELEASE and CS_RELEASE_CODE are removed. include/pcmcia/version.h is empty
now. It will be removed later, but for now it's left in the tree to avoid
touching all PCMCIA clients.
The only driver that needs to be changed is drivers/scsi/pcmcia/nsp_cs.c,
which uses CS_RELEASE_CODE.
Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/pcmcia/ds.h')
-rw-r--r-- | include/pcmcia/ds.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/pcmcia/ds.h b/include/pcmcia/ds.h index e0a5acb7fcb7..0190e766e1a7 100644 --- a/include/pcmcia/ds.h +++ b/include/pcmcia/ds.h | |||
@@ -49,7 +49,6 @@ typedef struct mtd_info_t { | |||
49 | } mtd_info_t; | 49 | } mtd_info_t; |
50 | 50 | ||
51 | typedef union ds_ioctl_arg_t { | 51 | typedef union ds_ioctl_arg_t { |
52 | servinfo_t servinfo; | ||
53 | adjust_t adjust; | 52 | adjust_t adjust; |
54 | config_info_t config; | 53 | config_info_t config; |
55 | tuple_t tuple; | 54 | tuple_t tuple; |
@@ -65,7 +64,6 @@ typedef union ds_ioctl_arg_t { | |||
65 | cisdump_t cisdump; | 64 | cisdump_t cisdump; |
66 | } ds_ioctl_arg_t; | 65 | } ds_ioctl_arg_t; |
67 | 66 | ||
68 | #define DS_GET_CARD_SERVICES_INFO _IOR ('d', 1, servinfo_t) | ||
69 | #define DS_ADJUST_RESOURCE_INFO _IOWR('d', 2, adjust_t) | 67 | #define DS_ADJUST_RESOURCE_INFO _IOWR('d', 2, adjust_t) |
70 | #define DS_GET_CONFIGURATION_INFO _IOWR('d', 3, config_info_t) | 68 | #define DS_GET_CONFIGURATION_INFO _IOWR('d', 3, config_info_t) |
71 | #define DS_GET_FIRST_TUPLE _IOWR('d', 4, tuple_t) | 69 | #define DS_GET_FIRST_TUPLE _IOWR('d', 4, tuple_t) |