aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/bluetooth/btuart_cs.c
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2009-10-24 09:45:06 -0400
committerDominik Brodowski <linux@dominikbrodowski.net>2009-11-08 12:23:15 -0500
commit9ac3e58ceff0b7b8b981c09c38a28742270eea12 (patch)
tree04f6137d3128750f5d2ff15c0a52cb17e6c00b35 /drivers/bluetooth/btuart_cs.c
parent444486a5f9d2737b50e53dc140292899b9497808 (diff)
pcmcia: deprecate CS_CHECK (bluetooth)
Remove all usages of the CS_CHECK macro and replace them with proper Linux style calling and return value checking. The extra error reporting may be dropped, as the PCMCIA core already complains about any (non-driver-author) errors. CC: linux-bluetooth@vger.kernel.org Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/bluetooth/btuart_cs.c')
-rw-r--r--drivers/bluetooth/btuart_cs.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/bluetooth/btuart_cs.c b/drivers/bluetooth/btuart_cs.c
index efd689a062eb..f44d75217b2b 100644
--- a/drivers/bluetooth/btuart_cs.c
+++ b/drivers/bluetooth/btuart_cs.c
@@ -669,21 +669,16 @@ static int btuart_config(struct pcmcia_device *link)
669 goto found_port; 669 goto found_port;
670 670
671 BT_ERR("No usable port range found"); 671 BT_ERR("No usable port range found");
672 cs_error(link, RequestIO, -ENODEV);
673 goto failed; 672 goto failed;
674 673
675found_port: 674found_port:
676 i = pcmcia_request_irq(link, &link->irq); 675 i = pcmcia_request_irq(link, &link->irq);
677 if (i != 0) { 676 if (i != 0)
678 cs_error(link, RequestIRQ, i);
679 link->irq.AssignedIRQ = 0; 677 link->irq.AssignedIRQ = 0;
680 }
681 678
682 i = pcmcia_request_configuration(link, &link->conf); 679 i = pcmcia_request_configuration(link, &link->conf);
683 if (i != 0) { 680 if (i != 0)
684 cs_error(link, RequestConfiguration, i);
685 goto failed; 681 goto failed;
686 }
687 682
688 if (btuart_open(info) != 0) 683 if (btuart_open(info) != 0)
689 goto failed; 684 goto failed;