2 files changed, 20 insertions, 20 deletions

diff --git a/drivers/char/pcmcia/cm4040_cs.c b/drivers/char/pcmcia/cm4040_cs.c
index e047bac56f0e..2d7c906435b7 100644
--- a/drivers/char/pcmcia/cm4040_cs.c
+++ b/drivers/char/pcmcia/cm4040_cs.c
@@ -567,8 +567,8 @@ static int reader_config(struct pcmcia_device *link, int devno)
 
         link->conf.IntType = 00000002;
 
-        if ((fail_rc = pcmcia_request_configuration(link,&link->conf))
-                                                                !=CS_SUCCESS) {
+        fail_rc = pcmcia_request_configuration(link, &link->conf);
+        if (fail_rc != 0) {
                 dev_printk(KERN_INFO, &handle_to_dev(link),
                            "pcmcia_request_configuration failed 0x%x\n",
                            fail_rc);
diff --git a/drivers/char/pcmcia/ipwireless/main.c b/drivers/char/pcmcia/ipwireless/main.c
index 1f520e544d45..24ffe0324e53 100644
--- a/drivers/char/pcmcia/ipwireless/main.c
+++ b/drivers/char/pcmcia/ipwireless/main.c
@@ -67,7 +67,7 @@ static void signalled_reboot_work(struct work_struct *work_reboot)
         struct pcmcia_device *link = ipw->link;
         int ret = pccard_reset_card(link->socket);
 
-        if (ret != CS_SUCCESS)
+        if (ret != 0)
                 cs_error(link, ResetCard, ret);
 }
 
@@ -104,7 +104,7 @@ static int config_ipwireless(struct ipw_dev *ipw)
         while (ret == 0) {
                 ret = pcmcia_get_tuple_data(link, &tuple);
 
-                if (ret != CS_SUCCESS) {
+                if (ret != 0) {
                         cs_error(link, GetTupleData, ret);
                         goto exit0;
                 }
@@ -115,21 +115,21 @@ static int config_ipwireless(struct ipw_dev *ipw)
 
         ret = pcmcia_get_first_tuple(link, &tuple);
 
-        if (ret != CS_SUCCESS) {
+        if (ret != 0) {
                 cs_error(link, GetFirstTuple, ret);
                 goto exit0;
         }
 
         ret = pcmcia_get_tuple_data(link, &tuple);
 
-        if (ret != CS_SUCCESS) {
+        if (ret != 0) {
                 cs_error(link, GetTupleData, ret);
                 goto exit0;
         }
 
         ret = pcmcia_parse_tuple(link, &tuple, &parse);
 
-        if (ret != CS_SUCCESS) {
+        if (ret != 0) {
                 cs_error(link, ParseTuple, ret);
                 goto exit0;
         }
@@ -151,21 +151,21 @@ static int config_ipwireless(struct ipw_dev *ipw)
 
         ret = pcmcia_get_first_tuple(link, &tuple);
 
-        if (ret != CS_SUCCESS) {
+        if (ret != 0) {
                 cs_error(link, GetFirstTuple, ret);
                 goto exit0;
         }
 
         ret = pcmcia_get_tuple_data(link, &tuple);
 
-        if (ret != CS_SUCCESS) {
+        if (ret != 0) {
                 cs_error(link, GetTupleData, ret);
                 goto exit0;
         }
 
         ret = pcmcia_parse_tuple(link, &tuple, &parse);
 
-        if (ret != CS_SUCCESS) {
+        if (ret != 0) {
                 cs_error(link, GetTupleData, ret);
                 goto exit0;
         }
@@ -180,7 +180,7 @@ static int config_ipwireless(struct ipw_dev *ipw)
 
         ret = pcmcia_request_io(link, &link->io);
 
-        if (ret != CS_SUCCESS) {
+        if (ret != 0) {
                 cs_error(link, RequestIO, ret);
                 goto exit0;
         }
@@ -194,21 +194,21 @@ static int config_ipwireless(struct ipw_dev *ipw)
 
         ret = pcmcia_get_first_tuple(link, &tuple);
 
-        if (ret != CS_SUCCESS) {
+        if (ret != 0) {
                 cs_error(link, GetFirstTuple, ret);
                 goto exit1;
         }
 
         ret = pcmcia_get_tuple_data(link, &tuple);
 
-        if (ret != CS_SUCCESS) {
+        if (ret != 0) {
                 cs_error(link, GetTupleData, ret);
                 goto exit1;
         }
 
         ret = pcmcia_parse_tuple(link, &tuple, &parse);
 
-        if (ret != CS_SUCCESS) {
+        if (ret != 0) {
                 cs_error(link, ParseTuple, ret);
                 goto exit1;
         }
@@ -226,7 +226,7 @@ static int config_ipwireless(struct ipw_dev *ipw)
                 ret = pcmcia_request_window(&link, &ipw->request_common_memory,
                                 &ipw->handle_common_memory);
 
-                if (ret != CS_SUCCESS) {
+                if (ret != 0) {
                         cs_error(link, RequestWindow, ret);
                         goto exit1;
                 }
@@ -238,7 +238,7 @@ static int config_ipwireless(struct ipw_dev *ipw)
                 ret = pcmcia_map_mem_page(ipw->handle_common_memory,
                                 &memreq_common_memory);
 
-                if (ret != CS_SUCCESS) {
+                if (ret != 0) {
                         cs_error(link, MapMemPage, ret);
                         goto exit1;
                 }
@@ -260,7 +260,7 @@ static int config_ipwireless(struct ipw_dev *ipw)
                 ret = pcmcia_request_window(&link, &ipw->request_attr_memory,
                                 &ipw->handle_attr_memory);
 
-                if (ret != CS_SUCCESS) {
+                if (ret != 0) {
                         cs_error(link, RequestWindow, ret);
                         goto exit2;
                 }
@@ -271,7 +271,7 @@ static int config_ipwireless(struct ipw_dev *ipw)
                 ret = pcmcia_map_mem_page(ipw->handle_attr_memory,
                                 &memreq_attr_memory);
 
-                if (ret != CS_SUCCESS) {
+                if (ret != 0) {
                         cs_error(link, MapMemPage, ret);
                         goto exit2;
                 }
@@ -291,7 +291,7 @@ static int config_ipwireless(struct ipw_dev *ipw)
 
         ret = pcmcia_request_irq(link, &link->irq);
 
-        if (ret != CS_SUCCESS) {
+        if (ret != 0) {
                 cs_error(link, RequestIRQ, ret);
                 goto exit3;
         }
@@ -331,7 +331,7 @@ static int config_ipwireless(struct ipw_dev *ipw)
          */
         ret = pcmcia_request_configuration(link, &link->conf);
 
-        if (ret != CS_SUCCESS) {
+        if (ret != 0) {
                 cs_error(link, RequestConfiguration, ret);
                 goto exit4;
         }