diff options
Diffstat (limited to 'drivers/pcmcia/pcmcia_ioctl.c')
-rw-r--r-- | drivers/pcmcia/pcmcia_ioctl.c | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/drivers/pcmcia/pcmcia_ioctl.c b/drivers/pcmcia/pcmcia_ioctl.c index b883bc151ed0..39ba6406fd54 100644 --- a/drivers/pcmcia/pcmcia_ioctl.c +++ b/drivers/pcmcia/pcmcia_ioctl.c | |||
@@ -31,7 +31,6 @@ | |||
31 | #include <linux/workqueue.h> | 31 | #include <linux/workqueue.h> |
32 | 32 | ||
33 | #define IN_CARD_SERVICES | 33 | #define IN_CARD_SERVICES |
34 | #include <pcmcia/version.h> | ||
35 | #include <pcmcia/cs_types.h> | 34 | #include <pcmcia/cs_types.h> |
36 | #include <pcmcia/cs.h> | 35 | #include <pcmcia/cs.h> |
37 | #include <pcmcia/cistpl.h> | 36 | #include <pcmcia/cistpl.h> |
@@ -71,29 +70,6 @@ extern int ds_pc_debug; | |||
71 | #define ds_dbg(lvl, fmt, arg...) do { } while (0) | 70 | #define ds_dbg(lvl, fmt, arg...) do { } while (0) |
72 | #endif | 71 | #endif |
73 | 72 | ||
74 | static const char *release = "Linux Kernel Card Services"; | ||
75 | |||
76 | /** pcmcia_get_card_services_info | ||
77 | * | ||
78 | * Return information about this version of Card Services | ||
79 | */ | ||
80 | static int pcmcia_get_card_services_info(servinfo_t *info) | ||
81 | { | ||
82 | unsigned int socket_count = 0; | ||
83 | struct list_head *tmp; | ||
84 | info->Signature[0] = 'C'; | ||
85 | info->Signature[1] = 'S'; | ||
86 | down_read(&pcmcia_socket_list_rwsem); | ||
87 | list_for_each(tmp, &pcmcia_socket_list) | ||
88 | socket_count++; | ||
89 | up_read(&pcmcia_socket_list_rwsem); | ||
90 | info->Count = socket_count; | ||
91 | info->Revision = CS_RELEASE_CODE; | ||
92 | info->CSLevel = 0x0210; | ||
93 | info->VendorString = (char *)release; | ||
94 | return CS_SUCCESS; | ||
95 | } /* get_card_services_info */ | ||
96 | |||
97 | 73 | ||
98 | /* backwards-compatible accessing of driver --- by name! */ | 74 | /* backwards-compatible accessing of driver --- by name! */ |
99 | 75 | ||
@@ -591,9 +567,6 @@ static int ds_ioctl(struct inode * inode, struct file * file, | |||
591 | case DS_ADJUST_RESOURCE_INFO: | 567 | case DS_ADJUST_RESOURCE_INFO: |
592 | ret = pcmcia_adjust_resource_info(&buf->adjust); | 568 | ret = pcmcia_adjust_resource_info(&buf->adjust); |
593 | break; | 569 | break; |
594 | case DS_GET_CARD_SERVICES_INFO: | ||
595 | ret = pcmcia_get_card_services_info(&buf->servinfo); | ||
596 | break; | ||
597 | case DS_GET_CONFIGURATION_INFO: | 570 | case DS_GET_CONFIGURATION_INFO: |
598 | if (buf->config.Function && | 571 | if (buf->config.Function && |
599 | (buf->config.Function >= s->functions)) | 572 | (buf->config.Function >= s->functions)) |