diff options
author | Dominik Brodowski <linux@dominikbrodowski.net> | 2008-08-03 04:47:59 -0400 |
---|---|---|
committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2008-08-22 20:29:41 -0400 |
commit | de6405e9d1e7530ea33b62e1a3921338f836a046 (patch) | |
tree | 4952537154518b48875bd126b3ac165ed4eb9198 /drivers/pcmcia/pcmcia_resource.c | |
parent | 1168386aa7d850ead2ae135d5a7949a592c6e9a0 (diff) |
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: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/pcmcia/pcmcia_resource.c')
-rw-r--r-- | drivers/pcmcia/pcmcia_resource.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/pcmcia/pcmcia_resource.c b/drivers/pcmcia/pcmcia_resource.c index 69d87a7e0766..3b8b0e14d8cf 100644 --- a/drivers/pcmcia/pcmcia_resource.c +++ b/drivers/pcmcia/pcmcia_resource.c | |||
@@ -475,8 +475,10 @@ int pcmcia_request_configuration(struct pcmcia_device *p_dev, | |||
475 | if (!(s->state & SOCKET_PRESENT)) | 475 | if (!(s->state & SOCKET_PRESENT)) |
476 | return CS_NO_CARD; | 476 | return CS_NO_CARD; |
477 | 477 | ||
478 | if (req->IntType & INT_CARDBUS) | 478 | if (req->IntType & INT_CARDBUS) { |
479 | return CS_UNSUPPORTED_MODE; | 479 | ds_dbg(p_dev->socket, 0, "IntType may not be INT_CARDBUS\n"); |
480 | return -EINVAL; | ||
481 | } | ||
480 | c = p_dev->function_config; | 482 | c = p_dev->function_config; |
481 | if (c->state & CONFIG_LOCKED) | 483 | if (c->state & CONFIG_LOCKED) |
482 | return CS_CONFIGURATION_LOCKED; | 484 | return CS_CONFIGURATION_LOCKED; |
@@ -592,7 +594,7 @@ int pcmcia_request_io(struct pcmcia_device *p_dev, io_req_t *req) | |||
592 | return CS_NO_CARD; | 594 | return CS_NO_CARD; |
593 | 595 | ||
594 | if (!req) | 596 | if (!req) |
595 | return CS_UNSUPPORTED_MODE; | 597 | return -EINVAL; |
596 | c = p_dev->function_config; | 598 | c = p_dev->function_config; |
597 | if (c->state & CONFIG_LOCKED) | 599 | if (c->state & CONFIG_LOCKED) |
598 | return CS_CONFIGURATION_LOCKED; | 600 | return CS_CONFIGURATION_LOCKED; |