Commit 8567142e authored by Dominik Brodowski's avatar Dominik Brodowski
Browse files

pcmcia: deprecate CS_GENERAL_FAILURE 



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

Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent 3939c1ef

drivers/pcmcia/cs.c

+2 −2
Original line number Diff line number Diff line
@@ -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) {

drivers/pcmcia/ds.c

+0 −1
Original line number Diff line number Diff line
@@ -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" },

include/pcmcia/cs.h

+1 −1
Original line number Diff line number Diff line
@@ -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