aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2008-08-03 06:27:56 -0400
committerDominik Brodowski <linux@dominikbrodowski.net>2008-08-22 20:34:36 -0400
commit9c8b7965f594fdff37c59446b9314ed7b4b44d07 (patch)
treead9d562c0f70c5b7723f7eda15b39d57da85755b
parent3f9c5f4cb7e00d424a56a6431e9c98b3b17851e4 (diff)
pcmcia: remove CS_ error codes alltogether
Remoe the CS_ error codes. Drivers are expected to use default error definitions (errno.h etc.). Only one CS_ error code -- CS_IN_USE -- is used internally by the (deprecated) pcmcia-cs userspace package. Therefore, keep this one around so that it still compiles. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
-rw-r--r--include/pcmcia/cs.h33
-rw-r--r--include/pcmcia/ds.h3
2 files changed, 3 insertions, 33 deletions
diff --git a/include/pcmcia/cs.h b/include/pcmcia/cs.h
index d672fdefdf22..3585e1be4c5c 100644
--- a/include/pcmcia/cs.h
+++ b/include/pcmcia/cs.h
@@ -287,39 +287,6 @@ typedef struct error_info_t {
287#define CS_EVENT_3VCARD 0x200000 287#define CS_EVENT_3VCARD 0x200000
288#define CS_EVENT_XVCARD 0x400000 288#define CS_EVENT_XVCARD 0x400000
289 289
290/* Return codes */
291#define CS_SUCCESS 0x00
292#define CS_BAD_ADAPTER -ENODEV
293#define CS_BAD_ATTRIBUTE -EINVAL
294#define CS_BAD_BASE -EINVAL
295#define CS_BAD_EDC -ENODEV
296#define CS_BAD_IRQ -EINVAL
297#define CS_BAD_OFFSET -EINVAL
298#define CS_BAD_PAGE -EINVAL
299#define CS_READ_FAILURE -EIO
300#define CS_BAD_SIZE -EINVAL
301#define CS_BAD_SOCKET -EINVAL
302#define CS_BAD_TYPE -EINVAL
303#define CS_BAD_VCC -EINVAL
304#define CS_BAD_VPP -EINVAL
305#define CS_BAD_WINDOW -ENODEV
306#define CS_WRITE_FAILURE -EIO
307#define CS_NO_CARD -ENODEV
308#define CS_UNSUPPORTED_FUNCTION -ENODEV
309#define CS_UNSUPPORTED_MODE -ENODEV
310#define CS_BAD_SPEED -ENODEV
311#define CS_BUSY -ENODEV
312#define CS_GENERAL_FAILURE -ETIMEDOUT
313#define CS_WRITE_PROTECTED -EPERM
314#define CS_BAD_ARG_LENGTH -ENODEV
315#define CS_BAD_ARGS -EINVAL
316#define CS_CONFIGURATION_LOCKED -EACCES
317#define CS_IN_USE -EBUSY
318#define CS_NO_MORE_ITEMS -ENOSPC
319#define CS_OUT_OF_RESOURCE -ENOMEM
320#define CS_BAD_HANDLE -EINVAL
321
322#define CS_BAD_TUPLE -EINVAL
323 290
324#ifdef __KERNEL__ 291#ifdef __KERNEL__
325 292
diff --git a/include/pcmcia/ds.h b/include/pcmcia/ds.h
index a06bbec386bd..9ff9de9ec3f0 100644
--- a/include/pcmcia/ds.h
+++ b/include/pcmcia/ds.h
@@ -138,6 +138,9 @@ typedef union ds_ioctl_arg_t {
138#define DS_UNBIND_REQUEST _IOW ('d', 63, bind_info_t) 138#define DS_UNBIND_REQUEST _IOW ('d', 63, bind_info_t)
139#define DS_BIND_MTD _IOWR('d', 64, mtd_info_t) 139#define DS_BIND_MTD _IOWR('d', 64, mtd_info_t)
140 140
141/* used in userspace only */
142#define CS_IN_USE 0x1e
143
141#ifdef __KERNEL__ 144#ifdef __KERNEL__
142#include <linux/device.h> 145#include <linux/device.h>
143#include <pcmcia/ss.h> 146#include <pcmcia/ss.h>