diff options
author | Dominik Brodowski <linux@dominikbrodowski.net> | 2008-08-03 04:07:45 -0400 |
---|---|---|
committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2008-08-22 20:29:26 -0400 |
commit | 4c89e88bfde6a3c179790e21004f24e09a058290 (patch) | |
tree | 2895a308d64aeabb5fde776d92572a51444d835b /drivers/serial/serial_cs.c | |
parent | 1a53088c101789bfca431de709ff6e45e8c77003 (diff) |
pcmcia: deprecate CS_SUCCESS
Instead of using own error or success codes, the PCMCIA code should rely on
the generic return values. Therefore, replace all occurrences of CS_SUCCESS
with 0.
CC: netdev@vger.kernel.org
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/serial/serial_cs.c')
-rw-r--r-- | drivers/serial/serial_cs.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/serial/serial_cs.c b/drivers/serial/serial_cs.c index 344e570fbb6f..ea7e3c0e02d9 100644 --- a/drivers/serial/serial_cs.c +++ b/drivers/serial/serial_cs.c | |||
@@ -431,10 +431,10 @@ first_tuple(struct pcmcia_device *handle, tuple_t * tuple, cisparse_t * parse) | |||
431 | { | 431 | { |
432 | int i; | 432 | int i; |
433 | i = pcmcia_get_first_tuple(handle, tuple); | 433 | i = pcmcia_get_first_tuple(handle, tuple); |
434 | if (i != CS_SUCCESS) | 434 | if (i != 0) |
435 | return CS_NO_MORE_ITEMS; | 435 | return CS_NO_MORE_ITEMS; |
436 | i = pcmcia_get_tuple_data(handle, tuple); | 436 | i = pcmcia_get_tuple_data(handle, tuple); |
437 | if (i != CS_SUCCESS) | 437 | if (i != 0) |
438 | return i; | 438 | return i; |
439 | return pcmcia_parse_tuple(handle, tuple, parse); | 439 | return pcmcia_parse_tuple(handle, tuple, parse); |
440 | } | 440 | } |
@@ -527,7 +527,7 @@ static int simple_config(struct pcmcia_device *link) | |||
527 | 527 | ||
528 | found_port: | 528 | found_port: |
529 | i = pcmcia_request_irq(link, &link->irq); | 529 | i = pcmcia_request_irq(link, &link->irq); |
530 | if (i != CS_SUCCESS) { | 530 | if (i != 0) { |
531 | cs_error(link, RequestIRQ, i); | 531 | cs_error(link, RequestIRQ, i); |
532 | link->irq.AssignedIRQ = 0; | 532 | link->irq.AssignedIRQ = 0; |
533 | } | 533 | } |
@@ -541,7 +541,7 @@ found_port: | |||
541 | info->quirk->config(link); | 541 | info->quirk->config(link); |
542 | 542 | ||
543 | i = pcmcia_request_configuration(link, &link->conf); | 543 | i = pcmcia_request_configuration(link, &link->conf); |
544 | if (i != CS_SUCCESS) { | 544 | if (i != 0) { |
545 | cs_error(link, RequestConfiguration, i); | 545 | cs_error(link, RequestConfiguration, i); |
546 | return -1; | 546 | return -1; |
547 | } | 547 | } |
@@ -609,7 +609,7 @@ static int multi_config(struct pcmcia_device *link) | |||
609 | } | 609 | } |
610 | 610 | ||
611 | i = pcmcia_request_irq(link, &link->irq); | 611 | i = pcmcia_request_irq(link, &link->irq); |
612 | if (i != CS_SUCCESS) { | 612 | if (i != 0) { |
613 | /* FIXME: comment does not fit, error handling does not fit */ | 613 | /* FIXME: comment does not fit, error handling does not fit */ |
614 | printk(KERN_NOTICE | 614 | printk(KERN_NOTICE |
615 | "serial_cs: no usable port range found, giving up\n"); | 615 | "serial_cs: no usable port range found, giving up\n"); |
@@ -624,7 +624,7 @@ static int multi_config(struct pcmcia_device *link) | |||
624 | info->quirk->config(link); | 624 | info->quirk->config(link); |
625 | 625 | ||
626 | i = pcmcia_request_configuration(link, &link->conf); | 626 | i = pcmcia_request_configuration(link, &link->conf); |
627 | if (i != CS_SUCCESS) { | 627 | if (i != 0) { |
628 | cs_error(link, RequestConfiguration, i); | 628 | cs_error(link, RequestConfiguration, i); |
629 | return -ENODEV; | 629 | return -ENODEV; |
630 | } | 630 | } |
@@ -702,7 +702,7 @@ static int serial_config(struct pcmcia_device * link) | |||
702 | /* Is this a compliant multifunction card? */ | 702 | /* Is this a compliant multifunction card? */ |
703 | tuple->DesiredTuple = CISTPL_LONGLINK_MFC; | 703 | tuple->DesiredTuple = CISTPL_LONGLINK_MFC; |
704 | tuple->Attributes = TUPLE_RETURN_COMMON | TUPLE_RETURN_LINK; | 704 | tuple->Attributes = TUPLE_RETURN_COMMON | TUPLE_RETURN_LINK; |
705 | info->multi = (first_tuple(link, tuple, parse) == CS_SUCCESS); | 705 | info->multi = (first_tuple(link, tuple, parse) == 0); |
706 | 706 | ||
707 | /* Is this a multiport card? */ | 707 | /* Is this a multiport card? */ |
708 | tuple->DesiredTuple = CISTPL_MANFID; | 708 | tuple->DesiredTuple = CISTPL_MANFID; |
@@ -726,7 +726,7 @@ static int serial_config(struct pcmcia_device * link) | |||
726 | ((link->func_id == CISTPL_FUNCID_MULTI) || | 726 | ((link->func_id == CISTPL_FUNCID_MULTI) || |
727 | (link->func_id == CISTPL_FUNCID_SERIAL))) { | 727 | (link->func_id == CISTPL_FUNCID_SERIAL))) { |
728 | tuple->DesiredTuple = CISTPL_CFTABLE_ENTRY; | 728 | tuple->DesiredTuple = CISTPL_CFTABLE_ENTRY; |
729 | if (first_tuple(link, tuple, parse) == CS_SUCCESS) { | 729 | if (first_tuple(link, tuple, parse) == 0) { |
730 | if ((cf->io.nwin == 1) && (cf->io.win[0].len % 8 == 0)) | 730 | if ((cf->io.nwin == 1) && (cf->io.win[0].len % 8 == 0)) |
731 | info->multi = cf->io.win[0].len >> 3; | 731 | info->multi = cf->io.win[0].len >> 3; |
732 | if ((cf->io.nwin == 2) && (cf->io.win[0].len == 8) && | 732 | if ((cf->io.nwin == 2) && (cf->io.win[0].len == 8) && |