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>

diff --git a/drivers/pcmcia/cs.c b/drivers/pcmcia/cs.c
index 15a1203d45fbde091199226973ffd201fd414fc9..f9424801b9c8b0979776424583e77c9400284eb6 100644 (file)
--- 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 aaac16aedee308279b4b72c50027907a0cbba0f6..cb500195342fa4f60dc4473727a6718e086b58b0 100644 (file)
--- 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 3b4cd51770dddd0f54a75df75ddaa77dbda0e0f8..bec295cb94f61fb62d8d8fc9139e79601fb9fe8c 100644 (file)
--- 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