[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>

3 files changed, 1 insertions, 12 deletions

diff --git a/include/pcmcia/cs.h b/include/pcmcia/cs.h
index db73b40429bd..2cab39f49eb2 100644
--- a/include/pcmcia/cs.h
+++ b/include/pcmcia/cs.h
@@ -68,14 +68,6 @@ typedef struct adjust_t {
 #define RES_ALLOCATED                   0x20
 #define RES_REMOVED                     0x40
 
-typedef struct servinfo_t {
-    char        Signature[2];
-    u_int       Count;
-    u_int       Revision;
-    u_int       CSLevel;
-    char        *VendorString;
-} servinfo_t;
-
 typedef struct event_callback_args_t {
         struct pcmcia_device    *client_handle;
         void                    *client_data;
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 {
 } mtd_info_t;
 
 typedef union ds_ioctl_arg_t {
-    servinfo_t          servinfo;
     adjust_t            adjust;
     config_info_t       config;
     tuple_t             tuple;
@@ -65,7 +64,6 @@ typedef union ds_ioctl_arg_t {
     cisdump_t           cisdump;
 } ds_ioctl_arg_t;
 
-#define DS_GET_CARD_SERVICES_INFO       _IOR ('d', 1, servinfo_t)
 #define DS_ADJUST_RESOURCE_INFO         _IOWR('d', 2, adjust_t)
 #define DS_GET_CONFIGURATION_INFO       _IOWR('d', 3, config_info_t)
 #define DS_GET_FIRST_TUPLE              _IOWR('d', 4, tuple_t)
diff --git a/include/pcmcia/version.h b/include/pcmcia/version.h
index eb88263fc8d5..5ad9c5e198b6 100644
--- a/include/pcmcia/version.h
+++ b/include/pcmcia/version.h
@@ -1,4 +1,3 @@
 /* version.h 1.94 2000/10/03 17:55:48 (David Hinds) */
 
-#define CS_RELEASE "3.1.22"
-#define CS_RELEASE_CODE 0x3116
+/* This file will be removed, please don't include it */