Staging: comedi: remove assignment in conditionals

[deliverable/linux.git] / drivers / staging / comedi / drivers / ni_labpc_cs.c

diff --git a/drivers/staging/comedi/drivers/ni_labpc_cs.c b/drivers/staging/comedi/drivers/ni_labpc_cs.c
index b0c523e9f198e41334928ea650524d84535a650d..e504f4f594a6522536ec2f0aff886ac4e3445175 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_labpc_cs.c
+++ b/drivers/staging/comedi/drivers/ni_labpc_cs.c
@@ -327,15 +327,21 @@ static void labpc_config(struct pcmcia_device *link)
        tuple.TupleData = buf;
        tuple.TupleDataMax = sizeof(buf);
        tuple.TupleOffset = 0;
-       if ((last_ret = pcmcia_get_first_tuple(link, &tuple))) {
+
+       last_ret = pcmcia_get_first_tuple(link, &tuple);
+       if (last_ret) {
                cs_error(link, GetFirstTuple, last_ret);
                goto cs_failed;
        }
-       if ((last_ret = pcmcia_get_tuple_data(link, &tuple))) {
+
+       last_ret = pcmcia_get_tuple_data(link, &tuple);
+       if (last_ret) {
                cs_error(link, GetTupleData, last_ret);
                goto cs_failed;
        }
-       if ((last_ret = pcmcia_parse_tuple(&tuple, &parse))) {
+
+       last_ret = pcmcia_parse_tuple(&tuple, &parse);
+       if (last_ret) {
                cs_error(link, ParseTuple, last_ret);
                goto cs_failed;
        }
@@ -355,7 +361,8 @@ static void labpc_config(struct pcmcia_device *link)
           will only use the CIS to fill in implementation-defined details.
         */
        tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
-       if ((last_ret = pcmcia_get_first_tuple(link, &tuple))) {
+       last_ret = pcmcia_get_first_tuple(link, &tuple);
+       if (last_ret) {
                cs_error(link, GetFirstTuple, last_ret);
                goto cs_failed;
        }
@@ -422,7 +429,8 @@ static void labpc_config(struct pcmcia_device *link)
                break;
 
              next_entry:
-               if ((last_ret = pcmcia_get_next_tuple(link, &tuple))) {
+               last_ret = pcmcia_get_next_tuple(link, &tuple);
+               if (last_ret) {
                        cs_error(link, GetNextTuple, last_ret);
                        goto cs_failed;
                }
@@ -433,18 +441,21 @@ static void labpc_config(struct pcmcia_device *link)
           handler to the interrupt, unless the 'Handler' member of the
           irq structure is initialized.
         */
-       if (link->conf.Attributes & CONF_ENABLE_IRQ)
-               if ((last_ret = pcmcia_request_irq(link, &link->irq))) {
+       if (link->conf.Attributes & CONF_ENABLE_IRQ) {
+               last_ret = pcmcia_request_irq(link, &link->irq);
+               if (last_ret) {
                        cs_error(link, RequestIRQ, last_ret);
                        goto cs_failed;
                }
+       }
 
        /*
           This actually configures the PCMCIA socket -- setting up
           the I/O windows and the interrupt mapping, and putting the
           card and host interface into "Memory and IO" mode.
         */
-       if ((last_ret = pcmcia_request_configuration(link, &link->conf))) {
+       last_ret = pcmcia_request_configuration(link, &link->conf);
+       if (last_ret) {
                cs_error(link, RequestConfiguration, last_ret);
                goto cs_failed;
        }