OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Dominik Brodowski 2008-08-03 11:15:45 +02:00
parent 3939c1ef1f
commit 8567142e87
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/pcmcia/cs.c
View File

@ -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) {

1
drivers/pcmcia/ds.c
View File

@ -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" },

2
include/pcmcia/cs.h
View File

@ -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