aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/bluetooth/bt3c_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/bt3c_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/bt3c_cs.c')
-rw-r--r--drivers/bluetooth/bt3c_cs.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/bluetooth/bt3c_cs.c b/drivers/bluetooth/bt3c_cs.c
index d58e22b9f06a..9787fda45d84 100644
--- a/drivers/bluetooth/bt3c_cs.c
+++ b/drivers/bluetooth/bt3c_cs.c
@@ -740,21 +740,16 @@ static int bt3c_config(struct pcmcia_device *link)
740 goto found_port; 740 goto found_port;
741 741
742 BT_ERR("No usable port range found"); 742 BT_ERR("No usable port range found");
743 cs_error(link, RequestIO, -ENODEV);
744 goto failed; 743 goto failed;
745 744
746found_port: 745found_port:
747 i = pcmcia_request_irq(link, &link->irq); 746 i = pcmcia_request_irq(link, &link->irq);
748 if (i != 0) { 747 if (i != 0)
749 cs_error(link, RequestIRQ, i);
750 link->irq.AssignedIRQ = 0; 748 link->irq.AssignedIRQ = 0;
751 }
752 749
753 i = pcmcia_request_configuration(link, &link->conf); 750 i = pcmcia_request_configuration(link, &link->conf);
754 if (i != 0) { 751 if (i != 0)
755 cs_error(link, RequestConfiguration, i);
756 goto failed; 752 goto failed;
757 }
758 753
759 if (bt3c_open(info) != 0) 754 if (bt3c_open(info) != 0)
760 goto failed; 755 goto failed;