pcmcia: deprecate CS_GENERAL_FAILURE

It's only used by pcmcia_core when socket-related queries time out.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>

3 files changed, 3 insertions, 4 deletions

diff --git a/drivers/pcmcia/cs.c b/drivers/pcmcia/cs.c
index 15a1203d45fb..f9424801b9c8 100644
--- a/drivers/pcmcia/cs.c
+++ b/drivers/pcmcia/cs.c
@@ -376,7 +376,7 @@ static int socket_reset(struct pcmcia_socket *skt)
         }
 
         cs_err(skt, "time out after reset.\n");
-        return CS_GENERAL_FAILURE;
+        return -ETIMEDOUT;
 }
 
 /*
@@ -445,7 +445,7 @@ static int socket_setup(struct pcmcia_socket *skt, int initial_delay)
 
         if (status & SS_PENDING) {
                 cs_err(skt, "voltage interrogation timed out.\n");
-                return CS_GENERAL_FAILURE;
+                return -ETIMEDOUT;
         }
 
         if (status & SS_CARDBUS) {
diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index aaac16aedee3..cb500195342f 100644
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -85,7 +85,6 @@ static const lookup_t error_table[] = {
     { -EIO,                     "Input/Output error" },
     { -ENODEV,                  "No card present" },
     { -EINVAL,                  "Bad parameter" },
-    { CS_GENERAL_FAILURE,       "General failure" },
     { CS_BAD_ARGS,              "Bad arguments" },
     { CS_CONFIGURATION_LOCKED,  "Configuration locked" },
     { CS_IN_USE,                "Resource in use" },
diff --git a/include/pcmcia/cs.h b/include/pcmcia/cs.h
index 3b4cd51770dd..bec295cb94f6 100644
--- a/include/pcmcia/cs.h
+++ b/include/pcmcia/cs.h
@@ -309,7 +309,7 @@ typedef struct error_info_t {
 #define CS_UNSUPPORTED_MODE     -ENODEV
 #define CS_BAD_SPEED            -ENODEV
 #define CS_BUSY                 -ENODEV
-#define CS_GENERAL_FAILURE      0x19
+#define CS_GENERAL_FAILURE      -ETIMEDOUT
 #define CS_WRITE_PROTECTED      -EPERM
 #define CS_BAD_ARG_LENGTH       -ENODEV
 #define CS_BAD_ARGS             0x1c