aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/bluetooth/bluecard_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/bluecard_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/bluecard_cs.c')
-rw-r--r--drivers/bluetooth/bluecard_cs.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/bluetooth/bluecard_cs.c b/drivers/bluetooth/bluecard_cs.c
index b0e569ba730..1e0c4d82297 100644
--- a/drivers/bluetooth/bluecard_cs.c
+++ b/drivers/bluetooth/bluecard_cs.c
@@ -905,22 +905,16 @@ static int bluecard_config(struct pcmcia_device *link)
905 break; 905 break;
906 } 906 }
907 907
908 if (i != 0) { 908 if (i != 0)
909 cs_error(link, RequestIO, i);
910 goto failed; 909 goto failed;
911 }
912 910
913 i = pcmcia_request_irq(link, &link->irq); 911 i = pcmcia_request_irq(link, &link->irq);
914 if (i != 0) { 912 if (i != 0)
915 cs_error(link, RequestIRQ, i);
916 link->irq.AssignedIRQ = 0; 913 link->irq.AssignedIRQ = 0;
917 }
918 914
919 i = pcmcia_request_configuration(link, &link->conf); 915 i = pcmcia_request_configuration(link, &link->conf);
920 if (i != 0) { 916 if (i != 0)
921 cs_error(link, RequestConfiguration, i);
922 goto failed; 917 goto failed;
923 }
924 918
925 if (bluecard_open(info) != 0) 919 if (bluecard_open(info) != 0)
926 goto failed; 920 goto failed;