pcmcia: deprecate CS_BAD_BASE, CS_BAD_IRQ, CS_BAD_OFFSET and CS_BAD_SIZE

[platform/kernel/linux-starfive.git] / include / pcmcia / cs.h

diff --git a/include/pcmcia/cs.h b/include/pcmcia/cs.h
index 45d84b2..4951eb9 100644 (file)
--- a/include/pcmcia/cs.h
+++ b/include/pcmcia/cs.h
@@ -73,27 +73,6 @@ typedef struct event_callback_args_t {
        void                    *client_data;
 } event_callback_args_t;
 
-/* for GetConfigurationInfo */
-typedef struct config_info_t {
-    u_char     Function;
-    u_int      Attributes;
-    u_int      Vcc, Vpp1, Vpp2;
-    u_int      IntType;
-    u_int      ConfigBase;
-    u_char     Status, Pin, Copy, Option, ExtStatus;
-    u_int      Present;
-    u_int      CardValues;
-    u_int      AssignedIRQ;
-    u_int      IRQAttributes;
-    ioaddr_t   BasePort1;
-    ioaddr_t   NumPorts1;
-    u_int      Attributes1;
-    ioaddr_t   BasePort2;
-    ioaddr_t   NumPorts2;
-    u_int      Attributes2;
-    u_int      IOAddrLines;
-} config_info_t;
-
 /* For CardValues field */
 #define CV_OPTION_VALUE                0x01
 #define CV_STATUS_VALUE                0x02
@@ -310,35 +289,35 @@ typedef struct error_info_t {
 
 /* Return codes */
 #define CS_SUCCESS             0x00
-#define CS_BAD_ADAPTER         0x01
-#define CS_BAD_ATTRIBUTE       0x02
-#define CS_BAD_BASE            0x03
-#define CS_BAD_EDC             0x04
-#define CS_BAD_IRQ             0x06
-#define CS_BAD_OFFSET          0x07
-#define CS_BAD_PAGE            0x08
-#define CS_READ_FAILURE                0x09
-#define CS_BAD_SIZE            0x0a
-#define CS_BAD_SOCKET          0x0b
-#define CS_BAD_TYPE            0x0d
-#define CS_BAD_VCC             0x0e
-#define CS_BAD_VPP             0x0f
-#define CS_BAD_WINDOW          0x11
-#define CS_WRITE_FAILURE       0x12
-#define CS_NO_CARD             0x14
-#define CS_UNSUPPORTED_FUNCTION        0x15
-#define CS_UNSUPPORTED_MODE    0x16
-#define CS_BAD_SPEED           0x17
-#define CS_BUSY                        0x18
-#define CS_GENERAL_FAILURE     0x19
-#define CS_WRITE_PROTECTED     0x1a
-#define CS_BAD_ARG_LENGTH      0x1b
+#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          -EIO
+#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            0x1c
-#define CS_CONFIGURATION_LOCKED        0x1d
-#define CS_IN_USE              0x1e
-#define CS_NO_MORE_ITEMS       0x1f
-#define CS_OUT_OF_RESOURCE     0x20
-#define CS_BAD_HANDLE          0x21
+#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           0x40
 
@@ -372,7 +351,6 @@ enum service {
 struct pcmcia_socket;
 
 int pcmcia_access_configuration_register(struct pcmcia_device *p_dev, conf_reg_t *reg);
-int pcmcia_get_configuration_info(struct pcmcia_device *p_dev, config_info_t *config);
 int pcmcia_get_mem_page(window_handle_t win, memreq_t *req);
 int pcmcia_map_mem_page(window_handle_t win, memreq_t *req);
 int pcmcia_modify_configuration(struct pcmcia_device *p_dev, modconf_t *mod);