aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia/pcmcia_resource.c
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2008-08-03 05:10:56 -0400
committerDominik Brodowski <linux@dominikbrodowski.net>2008-08-22 20:29:43 -0400
commit3939c1ef1f954409d1441c09fbc08376655758fe (patch)
treea66c10593b8b47a1a63471dd6fc6f9fb214063ca /drivers/pcmcia/pcmcia_resource.c
parentd8b0a49da4f213c637d458319432016f4ea5e12a (diff)
pcmcia: deprecate CS_NO_CARD
It means that no card can be detected in the socket, so return -ENODEV Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/pcmcia/pcmcia_resource.c')
-rw-r--r--drivers/pcmcia/pcmcia_resource.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/pcmcia/pcmcia_resource.c b/drivers/pcmcia/pcmcia_resource.c
index 9b61265fe7be..3e013854ec2d 100644
--- a/drivers/pcmcia/pcmcia_resource.c
+++ b/drivers/pcmcia/pcmcia_resource.c
@@ -169,7 +169,7 @@ int pcmcia_access_configuration_register(struct pcmcia_device *p_dev,
169 u_char val; 169 u_char val;
170 170
171 if (!p_dev || !p_dev->function_config) 171 if (!p_dev || !p_dev->function_config)
172 return CS_NO_CARD; 172 return -EINVAL;
173 173
174 s = p_dev->socket; 174 s = p_dev->socket;
175 c = p_dev->function_config; 175 c = p_dev->function_config;
@@ -206,7 +206,7 @@ int pcmcia_get_window(struct pcmcia_socket *s, window_handle_t *handle,
206 int w; 206 int w;
207 207
208 if (!s || !(s->state & SOCKET_PRESENT)) 208 if (!s || !(s->state & SOCKET_PRESENT))
209 return CS_NO_CARD; 209 return -ENODEV;
210 for (w = idx; w < MAX_WIN; w++) 210 for (w = idx; w < MAX_WIN; w++)
211 if (s->state & SOCKET_WIN_REQ(w)) 211 if (s->state & SOCKET_WIN_REQ(w))
212 break; 212 break;
@@ -276,7 +276,7 @@ int pcmcia_modify_configuration(struct pcmcia_device *p_dev,
276 c = p_dev->function_config; 276 c = p_dev->function_config;
277 277
278 if (!(s->state & SOCKET_PRESENT)) 278 if (!(s->state & SOCKET_PRESENT))
279 return CS_NO_CARD; 279 return -ENODEV;
280 if (!(c->state & CONFIG_LOCKED)) 280 if (!(c->state & CONFIG_LOCKED))
281 return CS_CONFIGURATION_LOCKED; 281 return CS_CONFIGURATION_LOCKED;
282 282
@@ -481,7 +481,7 @@ int pcmcia_request_configuration(struct pcmcia_device *p_dev,
481 pccard_io_map iomap; 481 pccard_io_map iomap;
482 482
483 if (!(s->state & SOCKET_PRESENT)) 483 if (!(s->state & SOCKET_PRESENT))
484 return CS_NO_CARD; 484 return -ENODEV;;
485 485
486 if (req->IntType & INT_CARDBUS) { 486 if (req->IntType & INT_CARDBUS) {
487 ds_dbg(p_dev->socket, 0, "IntType may not be INT_CARDBUS\n"); 487 ds_dbg(p_dev->socket, 0, "IntType may not be INT_CARDBUS\n");
@@ -602,7 +602,7 @@ int pcmcia_request_io(struct pcmcia_device *p_dev, io_req_t *req)
602 config_t *c; 602 config_t *c;
603 603
604 if (!(s->state & SOCKET_PRESENT)) 604 if (!(s->state & SOCKET_PRESENT))
605 return CS_NO_CARD; 605 return -ENODEV;
606 606
607 if (!req) 607 if (!req)
608 return -EINVAL; 608 return -EINVAL;
@@ -662,7 +662,7 @@ int pcmcia_request_irq(struct pcmcia_device *p_dev, irq_req_t *req)
662 int type; 662 int type;
663 663
664 if (!(s->state & SOCKET_PRESENT)) 664 if (!(s->state & SOCKET_PRESENT))
665 return CS_NO_CARD; 665 return -ENODEV;
666 c = p_dev->function_config; 666 c = p_dev->function_config;
667 if (c->state & CONFIG_LOCKED) 667 if (c->state & CONFIG_LOCKED)
668 return CS_CONFIGURATION_LOCKED; 668 return CS_CONFIGURATION_LOCKED;
@@ -771,7 +771,7 @@ int pcmcia_request_window(struct pcmcia_device **p_dev, win_req_t *req, window_h
771 int w; 771 int w;
772 772
773 if (!(s->state & SOCKET_PRESENT)) 773 if (!(s->state & SOCKET_PRESENT))
774 return CS_NO_CARD; 774 return -ENODEV;
775 if (req->Attributes & (WIN_PAGED | WIN_SHARED)) 775 if (req->Attributes & (WIN_PAGED | WIN_SHARED))
776 return CS_BAD_ATTRIBUTE; 776 return CS_BAD_ATTRIBUTE;
777 777