renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-11-20 00:26:39 +08:00
Code

pcmcia: deprecate CS_BAD_HANDLE

Browse Source 
CS_BAD_HANDLE means that something went badly wrong: no parameter was passed,
or the paramater passed wasn't the correct one. Therefore, replace it with
-EINVAL.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
This commit is contained in:
Dominik Brodowski 2008-08-03 11:18:00 +02:00
parent 8567142e87
commit ffb8da2027
4 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/pcmcia/cistpl.c
View File

@ -425,7 +425,7 @@ int pccard_get_next_tuple(struct pcmcia_socket *s, unsigned int func, tuple_t *t
int pccard_get_first_tuple(struct pcmcia_socket *s, unsigned int function, tuple_t *tuple) int pccard_get_first_tuple(struct pcmcia_socket *s, unsigned int function, tuple_t *tuple)
{ {
if (!s) if (!s)
return CS_BAD_HANDLE; return -EINVAL;
if (!(s->state & SOCKET_PRESENT)) if (!(s->state & SOCKET_PRESENT))
return -ENODEV; return -ENODEV;
tuple->TupleLink = tuple->Flags = 0; tuple->TupleLink = tuple->Flags = 0;
@ -505,7 +505,7 @@ int pccard_get_next_tuple(struct pcmcia_socket *s, unsigned int function, tuple_
int ofs, i, attr; int ofs, i, attr;
if (!s) if (!s)
return CS_BAD_HANDLE; return -EINVAL;
if (!(s->state & SOCKET_PRESENT)) if (!(s->state & SOCKET_PRESENT))
return -ENODEV; return -ENODEV;
@ -603,7 +603,7 @@ int pccard_get_tuple_data(struct pcmcia_socket *s, tuple_t *tuple)
u_int len; u_int len;
if (!s) if (!s)
return CS_BAD_HANDLE; return -EINVAL;
if (tuple->TupleLink < tuple->TupleOffset) if (tuple->TupleLink < tuple->TupleOffset)
return CS_NO_MORE_ITEMS; return CS_NO_MORE_ITEMS;
@ -1457,7 +1457,7 @@ int pccard_validate_cis(struct pcmcia_socket *s, unsigned int function, unsigned
int ret, reserved, dev_ok = 0, ident_ok = 0; int ret, reserved, dev_ok = 0, ident_ok = 0;
if (!s) if (!s)
return CS_BAD_HANDLE; return -EINVAL;
tuple = kmalloc(sizeof(*tuple), GFP_KERNEL); tuple = kmalloc(sizeof(*tuple), GFP_KERNEL);
if (tuple == NULL) { if (tuple == NULL) {

1
drivers/pcmcia/ds.c
View File

@ -90,7 +90,6 @@ static const lookup_t error_table[] = {
{ CS_IN_USE, "Resource in use" }, { CS_IN_USE, "Resource in use" },
{ CS_NO_MORE_ITEMS, "No more items" }, { CS_NO_MORE_ITEMS, "No more items" },
{ CS_OUT_OF_RESOURCE, "Out of resource" }, { CS_OUT_OF_RESOURCE, "Out of resource" },
{ CS_BAD_HANDLE, "Bad handle" },
{ CS_BAD_TUPLE, "Bad CIS tuple" } { CS_BAD_TUPLE, "Bad CIS tuple" }
}; };

12
drivers/pcmcia/pcmcia_resource.c
View File

@ -238,7 +238,7 @@ EXPORT_SYMBOL(pcmcia_get_window);
int pcmcia_get_mem_page(window_handle_t win, memreq_t *req) int pcmcia_get_mem_page(window_handle_t win, memreq_t *req)
{ {
if ((win == NULL) || (win->magic != WINDOW_MAGIC)) if ((win == NULL) || (win->magic != WINDOW_MAGIC))
return CS_BAD_HANDLE; return -EINVAL;
req->Page = 0; req->Page = 0;
req->CardOffset = win->ctl.card_start; req->CardOffset = win->ctl.card_start;
return 0; return 0;
@ -250,7 +250,7 @@ int pcmcia_map_mem_page(window_handle_t win, memreq_t *req)
{ {
struct pcmcia_socket *s; struct pcmcia_socket *s;
if ((win == NULL) || (win->magic != WINDOW_MAGIC)) if ((win == NULL) || (win->magic != WINDOW_MAGIC))
return CS_BAD_HANDLE; return -EINVAL;
if (req->Page != 0) if (req->Page != 0)
return CS_BAD_PAGE; return CS_BAD_PAGE;
s = win->sock; s = win->sock;
@ -389,7 +389,7 @@ static int pcmcia_release_io(struct pcmcia_device *p_dev, io_req_t *req)
config_t *c = p_dev->function_config; config_t *c = p_dev->function_config;
if (!p_dev->_io ) if (!p_dev->_io )
return CS_BAD_HANDLE; return -EINVAL;
p_dev->_io = 0; p_dev->_io = 0;
@ -415,7 +415,7 @@ static int pcmcia_release_irq(struct pcmcia_device *p_dev, irq_req_t *req)
config_t *c= p_dev->function_config; config_t *c= p_dev->function_config;
if (!p_dev->_irq) if (!p_dev->_irq)
return CS_BAD_HANDLE; return -EINVAL;
p_dev->_irq = 0; p_dev->_irq = 0;
if (c->state & CONFIG_LOCKED) if (c->state & CONFIG_LOCKED)
@ -446,10 +446,10 @@ int pcmcia_release_window(window_handle_t win)
struct pcmcia_socket *s; struct pcmcia_socket *s;
if ((win == NULL) || (win->magic != WINDOW_MAGIC)) if ((win == NULL) || (win->magic != WINDOW_MAGIC))
return CS_BAD_HANDLE; return -EINVAL;
s = win->sock; s = win->sock;
if (!(win->handle->_win & CLIENT_WIN_REQ(win->index))) if (!(win->handle->_win & CLIENT_WIN_REQ(win->index)))
return CS_BAD_HANDLE; return -EINVAL;
/* Shut down memory window */ /* Shut down memory window */
win->ctl.flags &= ~MAP_ACTIVE; win->ctl.flags &= ~MAP_ACTIVE;

2
include/pcmcia/cs.h
View File

@ -317,7 +317,7 @@ typedef struct error_info_t {
#define CS_IN_USE 0x1e #define CS_IN_USE 0x1e
#define CS_NO_MORE_ITEMS 0x1f #define CS_NO_MORE_ITEMS 0x1f
#define CS_OUT_OF_RESOURCE -ENOMEM #define CS_OUT_OF_RESOURCE -ENOMEM
#define CS_BAD_HANDLE 0x21 #define CS_BAD_HANDLE -EINVAL
#define CS_BAD_TUPLE 0x40 #define CS_BAD_TUPLE 0x40