Commit 635d19be authored by Dominik Brodowski's avatar Dominik Brodowski
Browse files

pcmcia: deprecate CS_NO_MORE_ITEMS 



CS_NO_MORE_ITEMS is returned by the CIS tuple reading and parsing code if
the end of a tuple chain is reached. As at least one PCMCIA driver relies
on matching this return value, replace it with -ENOSPC which is now
uniquely used for this purpose within the in-kernel pcmcia subsystem.

CC: Russell King <rmk+kernel@arm.linux.org.uk>
CC: linux-serial@vger.kernel.org
CC: Michael Buesch <mb@bu3sch.de>
Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent f958095e

drivers/pcmcia/cistpl.c

+5 −5
Original line number Diff line number Diff line
@@ -450,7 +450,7 @@ int pccard_get_first_tuple(struct pcmcia_socket *s, unsigned int function, tuple 
	if (pccard_get_next_tuple(s, function, tuple) == 0) {

	    tuple->DesiredTuple = CISTPL_LINKTARGET;

	    if (pccard_get_next_tuple(s, function, tuple) != 0)

		return CS_NO_MORE_ITEMS;

		return -ENOSPC;

	} else

	    tuple->CISOffset = tuple->TupleLink = 0;

	tuple->DesiredTuple = req;
@@ -526,7 +526,7 @@ int pccard_get_next_tuple(struct pcmcia_socket *s, unsigned int function, tuple_ 
	/* End of chain?  Follow long link if possible */

	if (link[0] == CISTPL_END) {

	    if ((ofs = follow_link(s, tuple)) < 0)

		return CS_NO_MORE_ITEMS;

		return -ENOSPC;

	    attr = SPACE(tuple->Flags);

	    read_cis_cache(s, attr, ofs, 2, link);

	}
@@ -584,7 +584,7 @@ int pccard_get_next_tuple(struct pcmcia_socket *s, unsigned int function, tuple_ 
    }

    if (i == MAX_TUPLES) {

	cs_dbg(s, 1, "cs: overrun in pcmcia_get_next_tuple\n");

	return CS_NO_MORE_ITEMS;

	return -ENOSPC;

    }

    

    tuple->TupleCode = link[0];
@@ -606,7 +606,7 @@ int pccard_get_tuple_data(struct pcmcia_socket *s, tuple_t *tuple) 
	return -EINVAL;



    if (tuple->TupleLink < tuple->TupleOffset)

	return CS_NO_MORE_ITEMS;

	return -ENOSPC;

    len = tuple->TupleLink - tuple->TupleOffset;

    tuple->TupleDataLen = tuple->TupleLink;

    if (len == 0)
@@ -1490,7 +1490,7 @@ int pccard_validate_cis(struct pcmcia_socket *s, unsigned int function, unsigned 
       cards have only a broken VERS_2 tuple; hence the bogus test. */

    if ((pccard_read_tuple(s, function, CISTPL_MANFID, p) == 0) ||

	(pccard_read_tuple(s, function, CISTPL_VERS_1, p) == 0) ||

	(pccard_read_tuple(s, function, CISTPL_VERS_2, p) != CS_NO_MORE_ITEMS))

	(pccard_read_tuple(s, function, CISTPL_VERS_2, p) != -ENOSPC))

	ident_ok++;



    if (!dev_ok && !ident_ok)

drivers/pcmcia/ds.c

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ static const lookup_t error_table[] = { 
    { CS_BAD_ARGS,		"Bad arguments" },

    { -EACCES,			"Configuration locked" },

    { CS_IN_USE,		"Resource in use" },

    { CS_NO_MORE_ITEMS,		"No more items" },

    { -ENOSPC,			"No more items" },

    { CS_OUT_OF_RESOURCE,	"Out of resource" },

    { CS_BAD_TUPLE,		"Bad CIS tuple" }

};

drivers/pcmcia/pcmcia_ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -973,7 +973,7 @@ static int ds_ioctl(struct inode * inode, struct file * file, 
	    err = -EBUSY; break;

	case CS_OUT_OF_RESOURCE:

	    err = -ENOSPC; break;

	case CS_NO_MORE_ITEMS:

	case -ENOSPC:

	    err = -ENODATA; break;

	case -ENOSYS:

	    err = -ENOSYS; break;

drivers/pcmcia/pcmcia_resource.c

+1 −1
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ int pcmcia_get_window(struct pcmcia_socket *s, window_handle_t *handle, 
		if (s->state & SOCKET_WIN_REQ(w))

			break;

	if (w == MAX_WIN)

		return CS_NO_MORE_ITEMS;

		return -EINVAL;

	win = &s->win[w];

	req->Base = win->ctl.res->start;

	req->Size = win->ctl.res->end - win->ctl.res->start + 1;

drivers/serial/serial_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -432,7 +432,7 @@ first_tuple(struct pcmcia_device *handle, tuple_t * tuple, cisparse_t * parse) 
	int i;

	i = pcmcia_get_first_tuple(handle, tuple);

	if (i != 0)

		return CS_NO_MORE_ITEMS;

		return i;

	i = pcmcia_get_tuple_data(handle, tuple);

	if (i != 0)

		return i;

CRA Git | Maintained and supported by SUSTech CRA and CCSE