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 /drivers/scsi/pcmcia | |
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 'drivers/scsi/pcmcia')
-rw-r--r-- | drivers/scsi/pcmcia/nsp_cs.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c index c8755adfd917..506bbb446e5e 100644 --- a/drivers/scsi/pcmcia/nsp_cs.c +++ b/drivers/scsi/pcmcia/nsp_cs.c | |||
@@ -2155,10 +2155,6 @@ static int __init nsp_cs_init(void) | |||
2155 | 2155 | ||
2156 | nsp_msg(KERN_INFO, "loading..."); | 2156 | nsp_msg(KERN_INFO, "loading..."); |
2157 | pcmcia_get_card_services_info(&serv); | 2157 | pcmcia_get_card_services_info(&serv); |
2158 | if (serv.Revision != CS_RELEASE_CODE) { | ||
2159 | nsp_msg(KERN_DEBUG, "Card Services release does not match!"); | ||
2160 | return -EINVAL; | ||
2161 | } | ||
2162 | register_pcmcia_driver(&dev_info, &nsp_cs_attach, &nsp_cs_detach); | 2158 | register_pcmcia_driver(&dev_info, &nsp_cs_attach, &nsp_cs_detach); |
2163 | 2159 | ||
2164 | nsp_dbg(NSP_DEBUG_INIT, "out"); | 2160 | nsp_dbg(NSP_DEBUG_INIT, "out"); |