aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2008-08-03 11:15:45 +0200
committerDominik Brodowski <linux@dominikbrodowski.net>2008-08-23 02:29:44 +0200
commit8567142e87322141f9344d1ab632ccf5190cd0d3 (patch)
treec97d0ceead6690580b7a595a5b7dc7113a6c37f6
parent3939c1ef1f954409d1441c09fbc08376655758fe (diff)
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>
-rw-r--r--drivers/pcmcia/cs.c4
-rw-r--r--drivers/pcmcia/ds.c1
-rw-r--r--include/pcmcia/cs.h2
3 files changed, 3 insertions, 4 deletions
diff --git a/drivers/pcmcia/cs.c b/drivers/pcmcia/cs.c
index 15a1203d45f..f9424801b9c 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 aaac16aedee..cb500195342 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 3b4cd51770d..bec295cb94f 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