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>

diff --git a/include/pcmcia/cs.h b/include/pcmcia/cs.h
index d672fdefdf22545c3b9a4e65e1b2c9c87083809b..3585e1be4c5cf6c67a42ad1ad72324c3c6553a5e 100644 (file)
--- a/include/pcmcia/cs.h
+++ b/include/pcmcia/cs.h
@@ -287,39 +287,6 @@ typedef struct error_info_t {
 #define CS_EVENT_3VCARD                        0x200000
 #define CS_EVENT_XVCARD                        0x400000
 
-/* Return codes */
-#define CS_SUCCESS             0x00
-#define CS_BAD_ADAPTER         -ENODEV
-#define CS_BAD_ATTRIBUTE       -EINVAL
-#define CS_BAD_BASE            -EINVAL
-#define CS_BAD_EDC             -ENODEV
-#define CS_BAD_IRQ             -EINVAL
-#define CS_BAD_OFFSET          -EINVAL
-#define CS_BAD_PAGE            -EINVAL
-#define CS_READ_FAILURE                -EIO
-#define CS_BAD_SIZE            -EINVAL
-#define CS_BAD_SOCKET          -EINVAL
-#define CS_BAD_TYPE            -EINVAL
-#define CS_BAD_VCC             -EINVAL
-#define CS_BAD_VPP             -EINVAL
-#define CS_BAD_WINDOW          -ENODEV
-#define CS_WRITE_FAILURE       -EIO
-#define CS_NO_CARD             -ENODEV
-#define CS_UNSUPPORTED_FUNCTION        -ENODEV
-#define CS_UNSUPPORTED_MODE    -ENODEV
-#define CS_BAD_SPEED           -ENODEV
-#define CS_BUSY                        -ENODEV
-#define CS_GENERAL_FAILURE     -ETIMEDOUT
-#define CS_WRITE_PROTECTED     -EPERM
-#define CS_BAD_ARG_LENGTH      -ENODEV
-#define CS_BAD_ARGS            -EINVAL
-#define CS_CONFIGURATION_LOCKED        -EACCES
-#define CS_IN_USE              -EBUSY
-#define CS_NO_MORE_ITEMS       -ENOSPC
-#define CS_OUT_OF_RESOURCE     -ENOMEM
-#define CS_BAD_HANDLE          -EINVAL
-
-#define CS_BAD_TUPLE           -EINVAL
 
 #ifdef __KERNEL__
 

diff --git a/include/pcmcia/ds.h b/include/pcmcia/ds.h
index a06bbec386bdcb1d0c88e616a4b49df0b7143e09..9ff9de9ec3f07c12b7a77ca3d2b50fe4238ac7c3 100644 (file)
--- a/include/pcmcia/ds.h
+++ b/include/pcmcia/ds.h
@@ -138,6 +138,9 @@ typedef union ds_ioctl_arg_t {
 #define DS_UNBIND_REQUEST              _IOW ('d', 63, bind_info_t)
 #define DS_BIND_MTD                    _IOWR('d', 64, mtd_info_t)
 
+/* used in userspace only */
+#define CS_IN_USE                      0x1e
+
 #ifdef __KERNEL__
 #include <linux/device.h>
 #include <pcmcia/ss.h>