aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/isdn
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2008-08-03 04:07:45 -0400
committerDominik Brodowski <linux@dominikbrodowski.net>2008-08-22 20:29:26 -0400
commit4c89e88bfde6a3c179790e21004f24e09a058290 (patch)
tree2895a308d64aeabb5fde776d92572a51444d835b /drivers/isdn
parent1a53088c101789bfca431de709ff6e45e8c77003 (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/isdn')
-rw-r--r--drivers/isdn/hardware/avm/avm_cs.c4
-rw-r--r--drivers/isdn/hisax/avma1_cs.c4
-rw-r--r--drivers/isdn/hisax/elsa_cs.c6
-rw-r--r--drivers/isdn/hisax/teles_cs.c6
4 files changed, 10 insertions, 10 deletions
diff --git a/drivers/isdn/hardware/avm/avm_cs.c b/drivers/isdn/hardware/avm/avm_cs.c
index 388046539705..c72565520e41 100644
--- a/drivers/isdn/hardware/avm/avm_cs.c
+++ b/drivers/isdn/hardware/avm/avm_cs.c
@@ -197,7 +197,7 @@ static int avmcs_config(struct pcmcia_device *link)
197 * allocate an interrupt line 197 * allocate an interrupt line
198 */ 198 */
199 i = pcmcia_request_irq(link, &link->irq); 199 i = pcmcia_request_irq(link, &link->irq);
200 if (i != CS_SUCCESS) { 200 if (i != 0) {
201 cs_error(link, RequestIRQ, i); 201 cs_error(link, RequestIRQ, i);
202 /* undo */ 202 /* undo */
203 pcmcia_disable_device(link); 203 pcmcia_disable_device(link);
@@ -208,7 +208,7 @@ static int avmcs_config(struct pcmcia_device *link)
208 * configure the PCMCIA socket 208 * configure the PCMCIA socket
209 */ 209 */
210 i = pcmcia_request_configuration(link, &link->conf); 210 i = pcmcia_request_configuration(link, &link->conf);
211 if (i != CS_SUCCESS) { 211 if (i != 0) {
212 cs_error(link, RequestConfiguration, i); 212 cs_error(link, RequestConfiguration, i);
213 pcmcia_disable_device(link); 213 pcmcia_disable_device(link);
214 break; 214 break;
diff --git a/drivers/isdn/hisax/avma1_cs.c b/drivers/isdn/hisax/avma1_cs.c
index 8fd3ca0fb93a..23560c897ec3 100644
--- a/drivers/isdn/hisax/avma1_cs.c
+++ b/drivers/isdn/hisax/avma1_cs.c
@@ -217,7 +217,7 @@ static int avma1cs_config(struct pcmcia_device *link)
217 * allocate an interrupt line 217 * allocate an interrupt line
218 */ 218 */
219 i = pcmcia_request_irq(link, &link->irq); 219 i = pcmcia_request_irq(link, &link->irq);
220 if (i != CS_SUCCESS) { 220 if (i != 0) {
221 cs_error(link, RequestIRQ, i); 221 cs_error(link, RequestIRQ, i);
222 /* undo */ 222 /* undo */
223 pcmcia_disable_device(link); 223 pcmcia_disable_device(link);
@@ -228,7 +228,7 @@ static int avma1cs_config(struct pcmcia_device *link)
228 * configure the PCMCIA socket 228 * configure the PCMCIA socket
229 */ 229 */
230 i = pcmcia_request_configuration(link, &link->conf); 230 i = pcmcia_request_configuration(link, &link->conf);
231 if (i != CS_SUCCESS) { 231 if (i != 0) {
232 cs_error(link, RequestConfiguration, i); 232 cs_error(link, RequestConfiguration, i);
233 pcmcia_disable_device(link); 233 pcmcia_disable_device(link);
234 break; 234 break;
diff --git a/drivers/isdn/hisax/elsa_cs.c b/drivers/isdn/hisax/elsa_cs.c
index 2bf0016dea5e..f4d0fe29bcf8 100644
--- a/drivers/isdn/hisax/elsa_cs.c
+++ b/drivers/isdn/hisax/elsa_cs.c
@@ -238,20 +238,20 @@ static int elsa_cs_config(struct pcmcia_device *link)
238 dev = link->priv; 238 dev = link->priv;
239 239
240 i = pcmcia_loop_config(link, elsa_cs_configcheck, NULL); 240 i = pcmcia_loop_config(link, elsa_cs_configcheck, NULL);
241 if (i != CS_SUCCESS) { 241 if (i != 0) {
242 last_fn = RequestIO; 242 last_fn = RequestIO;
243 goto cs_failed; 243 goto cs_failed;
244 } 244 }
245 245
246 i = pcmcia_request_irq(link, &link->irq); 246 i = pcmcia_request_irq(link, &link->irq);
247 if (i != CS_SUCCESS) { 247 if (i != 0) {
248 link->irq.AssignedIRQ = 0; 248 link->irq.AssignedIRQ = 0;
249 last_fn = RequestIRQ; 249 last_fn = RequestIRQ;
250 goto cs_failed; 250 goto cs_failed;
251 } 251 }
252 252
253 i = pcmcia_request_configuration(link, &link->conf); 253 i = pcmcia_request_configuration(link, &link->conf);
254 if (i != CS_SUCCESS) { 254 if (i != 0) {
255 last_fn = RequestConfiguration; 255 last_fn = RequestConfiguration;
256 goto cs_failed; 256 goto cs_failed;
257 } 257 }
diff --git a/drivers/isdn/hisax/teles_cs.c b/drivers/isdn/hisax/teles_cs.c
index 21cabd0aadbe..623d111544d4 100644
--- a/drivers/isdn/hisax/teles_cs.c
+++ b/drivers/isdn/hisax/teles_cs.c
@@ -228,20 +228,20 @@ static int teles_cs_config(struct pcmcia_device *link)
228 dev = link->priv; 228 dev = link->priv;
229 229
230 i = pcmcia_loop_config(link, teles_cs_configcheck, NULL); 230 i = pcmcia_loop_config(link, teles_cs_configcheck, NULL);
231 if (i != CS_SUCCESS) { 231 if (i != 0) {
232 last_fn = RequestIO; 232 last_fn = RequestIO;
233 goto cs_failed; 233 goto cs_failed;
234 } 234 }
235 235
236 i = pcmcia_request_irq(link, &link->irq); 236 i = pcmcia_request_irq(link, &link->irq);
237 if (i != CS_SUCCESS) { 237 if (i != 0) {
238 link->irq.AssignedIRQ = 0; 238 link->irq.AssignedIRQ = 0;
239 last_fn = RequestIRQ; 239 last_fn = RequestIRQ;
240 goto cs_failed; 240 goto cs_failed;
241 } 241 }
242 242
243 i = pcmcia_request_configuration(link, &link->conf); 243 i = pcmcia_request_configuration(link, &link->conf);
244 if (i != CS_SUCCESS) { 244 if (i != 0) {
245 last_fn = RequestConfiguration; 245 last_fn = RequestConfiguration;
246 goto cs_failed; 246 goto cs_failed;
247 } 247 }