aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2008-08-03 05:15:45 -0400
committerDominik Brodowski <linux@dominikbrodowski.net>2008-08-22 20:29:44 -0400
commit8567142e87322141f9344d1ab632ccf5190cd0d3 (patch)
treec97d0ceead6690580b7a595a5b7dc7113a6c37f6 /drivers/pcmcia
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>
Diffstat (limited to 'drivers/pcmcia')
-rw-r--r--drivers/pcmcia/cs.c4
-rw-r--r--drivers/pcmcia/ds.c1
2 files changed, 2 insertions, 3 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)
376 } 376 }
377 377
378 cs_err(skt, "time out after reset.\n"); 378 cs_err(skt, "time out after reset.\n");
379 return CS_GENERAL_FAILURE; 379 return -ETIMEDOUT;
380} 380}
381 381
382/* 382/*
@@ -445,7 +445,7 @@ static int socket_setup(struct pcmcia_socket *skt, int initial_delay)
445 445
446 if (status & SS_PENDING) { 446 if (status & SS_PENDING) {
447 cs_err(skt, "voltage interrogation timed out.\n"); 447 cs_err(skt, "voltage interrogation timed out.\n");
448 return CS_GENERAL_FAILURE; 448 return -ETIMEDOUT;
449 } 449 }
450 450
451 if (status & SS_CARDBUS) { 451 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[] = {
85 { -EIO, "Input/Output error" }, 85 { -EIO, "Input/Output error" },
86 { -ENODEV, "No card present" }, 86 { -ENODEV, "No card present" },
87 { -EINVAL, "Bad parameter" }, 87 { -EINVAL, "Bad parameter" },
88 { CS_GENERAL_FAILURE, "General failure" },
89 { CS_BAD_ARGS, "Bad arguments" }, 88 { CS_BAD_ARGS, "Bad arguments" },
90 { CS_CONFIGURATION_LOCKED, "Configuration locked" }, 89 { CS_CONFIGURATION_LOCKED, "Configuration locked" },
91 { CS_IN_USE, "Resource in use" }, 90 { CS_IN_USE, "Resource in use" },