Commit de6405e9 authored by Dominik Brodowski's avatar Dominik Brodowski
Browse files

pcmcia: deprecate CS_UNSUPPORTED_* 



CS_UNSUPPORTED_MODE and CS_UNSUPPORTED_FUNCTION were mostly used to denote
trying to use PCMCIA functions on CardBus cards.

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

drivers/pcmcia/cistpl.c

+1 −1
Original line number Diff line number Diff line
@@ -1397,7 +1397,7 @@ int pccard_parse_tuple(tuple_t *tuple, cisparse_t *parse) 
	ret = 0;

	break;

    default:

	ret = CS_UNSUPPORTED_FUNCTION;

	ret = -EINVAL;

	break;

    }

    return ret;

drivers/pcmcia/cs.c

+3 −3
Original line number Diff line number Diff line
@@ -769,7 +769,7 @@ int pccard_reset_card(struct pcmcia_socket *skt) 
			break;

		}

		if (skt->state & SOCKET_CARDBUS) {

			ret = CS_UNSUPPORTED_FUNCTION;

			ret = -EPERM;

			break;

		}
@@ -810,7 +810,7 @@ int pcmcia_suspend_card(struct pcmcia_socket *skt) 
			break;

		}

		if (skt->state & SOCKET_CARDBUS) {

			ret = CS_UNSUPPORTED_FUNCTION;

			ret = -EPERM;

			break;

		}

		if (skt->callback) {
@@ -840,7 +840,7 @@ int pcmcia_resume_card(struct pcmcia_socket *skt) 
			break;

		}

		if (skt->state & SOCKET_CARDBUS) {

			ret = CS_UNSUPPORTED_FUNCTION;

			ret = -EPERM;

			break;

		}

		ret = socket_resume(skt);

drivers/pcmcia/ds.c

+1 −2
Original line number Diff line number Diff line
@@ -85,8 +85,7 @@ static const lookup_t error_table[] = { 
    { CS_BAD_VCC,		"Bad Vcc" },

    { CS_BAD_VPP,		"Bad Vpp" },

    { CS_NO_CARD,		"No card present" },

    { CS_UNSUPPORTED_FUNCTION,	"Usupported function" },

    { CS_UNSUPPORTED_MODE,	"Unsupported mode" },

    { -EINVAL,			"Bad parameter" },

    { CS_GENERAL_FAILURE,	"General failure" },

    { CS_BAD_ARGS,		"Bad arguments" },

    { CS_CONFIGURATION_LOCKED,	"Configuration locked" },

drivers/pcmcia/pcmcia_ioctl.c

+2 −2
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ static inline int adjust_irq(struct pcmcia_socket *s, adjust_t *adj) { 
static int pcmcia_adjust_resource_info(adjust_t *adj)

{

	struct pcmcia_socket *s;

	int ret = CS_UNSUPPORTED_FUNCTION;

	int ret = -ENOSYS;

	unsigned long flags;



	down_read(&pcmcia_socket_list_rwsem);
@@ -975,7 +975,7 @@ static int ds_ioctl(struct inode * inode, struct file * file, 
	    err = -ENOSPC; break;

	case CS_NO_MORE_ITEMS:

	    err = -ENODATA; break;

	case CS_UNSUPPORTED_FUNCTION:

	case -ENOSYS:

	    err = -ENOSYS; break;

	default:

	    err = -EIO; break;

drivers/pcmcia/pcmcia_resource.c

+5 −3
Original line number Diff line number Diff line
@@ -475,8 +475,10 @@ int pcmcia_request_configuration(struct pcmcia_device *p_dev, 
	if (!(s->state & SOCKET_PRESENT))

		return CS_NO_CARD;



	if (req->IntType & INT_CARDBUS)

		return CS_UNSUPPORTED_MODE;

	if (req->IntType & INT_CARDBUS) {

		ds_dbg(p_dev->socket, 0, "IntType may not be INT_CARDBUS\n");

		return -EINVAL;

	}

	c = p_dev->function_config;

	if (c->state & CONFIG_LOCKED)

		return CS_CONFIGURATION_LOCKED;
@@ -592,7 +594,7 @@ int pcmcia_request_io(struct pcmcia_device *p_dev, io_req_t *req) 
		return CS_NO_CARD;



	if (!req)

		return CS_UNSUPPORTED_MODE;

		return -EINVAL;

	c = p_dev->function_config;

	if (c->state & CONFIG_LOCKED)

		return CS_CONFIGURATION_LOCKED;