From 197c82bf25b9e379cb5646561be1a727ab9e84a7 Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Mon, 16 Mar 2009 22:03:51 -0400 Subject: [PATCH] Staging: comedi: Remove instances of assignments in conditionals Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/icp_multi.c | 15 +++++++----- drivers/staging/comedi/drivers/icp_multi.h | 8 ++++--- drivers/staging/comedi/drivers/rtd520.c | 9 +++++--- drivers/staging/comedi/drivers/s626.c | 23 +++++++++++-------- .../comedi/kcomedilib/kcomedilib_main.c | 7 ++++-- 5 files changed, 39 insertions(+), 23 deletions(-) diff --git a/drivers/staging/comedi/drivers/icp_multi.c b/drivers/staging/comedi/drivers/icp_multi.c index aefd1c16ab2b..d474cb2cb7e5 100644 --- a/drivers/staging/comedi/drivers/icp_multi.c +++ b/drivers/staging/comedi/drivers/icp_multi.c @@ -882,7 +882,8 @@ static int icp_multi_attach(comedi_device *dev, comedi_devconfig *it) printk("icp_multi EDBG: BGN: icp_multi_attach(...)\n"); /* Alocate private data storage space */ - if ((ret = alloc_private(dev, sizeof(icp_multi_private))) < 0) + ret = alloc_private(dev, sizeof(icp_multi_private)); + if (ret < 0) return ret; /* Initialise list of PCI cards in system, if not already done so */ @@ -899,9 +900,11 @@ static int icp_multi_attach(comedi_device *dev, comedi_devconfig *it) printk("Anne's comedi%d: icp_multi: board=%s", dev->minor, this_board->name); - if ((card = select_and_alloc_pci_card(PCI_VENDOR_ID_ICP, - this_board->device_id, it->options[0], - it->options[1])) == NULL) + card = select_and_alloc_pci_card(PCI_VENDOR_ID_ICP, + this_board->device_id, it->options[0], + it->options[1]); + + if (card == NULL) return -EIO; devpriv->card = card; @@ -943,9 +946,9 @@ static int icp_multi_attach(comedi_device *dev, comedi_devconfig *it) if (this_board->n_ctrs) n_subdevices++; - if ((ret = alloc_subdevices(dev, n_subdevices)) < 0) { + ret = alloc_subdevices(dev, n_subdevices); + if ( ret < 0 ) return ret; - } icp_multi_reset(dev); diff --git a/drivers/staging/comedi/drivers/icp_multi.h b/drivers/staging/comedi/drivers/icp_multi.h index c0abc1062b8d..0796056a07a4 100644 --- a/drivers/staging/comedi/drivers/icp_multi.h +++ b/drivers/staging/comedi/drivers/icp_multi.h @@ -245,8 +245,9 @@ static struct pcilst_struct *select_and_alloc_pci_card(unsigned short vendor_id, int err; if ((pci_bus < 1) & (pci_slot < 1)) { /* use autodetection */ - if ((card = find_free_pci_card_by_device(vendor_id, - device_id)) == NULL) { + + card = find_free_pci_card_by_device(vendor_id,device_id); + if (card == NULL) { rt_printk(" - Unused card not found in system!\n"); return NULL; } @@ -266,7 +267,8 @@ static struct pcilst_struct *select_and_alloc_pci_card(unsigned short vendor_id, } } - if ((err = pci_card_alloc(card)) != 0) { + err = pci_card_alloc(card); + if ( err != 0) { if (err > 0) rt_printk(" - Can't allocate card!\n"); /* else: error already printed. */ diff --git a/drivers/staging/comedi/drivers/rtd520.c b/drivers/staging/comedi/drivers/rtd520.c index 08e3dde67f8c..578b731ae500 100644 --- a/drivers/staging/comedi/drivers/rtd520.c +++ b/drivers/staging/comedi/drivers/rtd520.c @@ -779,7 +779,8 @@ static int rtd_attach(comedi_device *dev, comedi_devconfig *it) devpriv->pci_dev = pcidev; dev->board_name = thisboard->name; - if ((ret = comedi_pci_enable(pcidev, DRV_NAME)) < 0) { + ret = comedi_pci_enable(pcidev, DRV_NAME); + if (ret < 0) { printk("Failed to enable PCI device and request regions.\n"); return ret; } @@ -918,8 +919,10 @@ static int rtd_attach(comedi_device *dev, comedi_devconfig *it) /* TODO: set user out source ??? */ /* check if our interrupt is available and get it */ - if ((ret = comedi_request_irq(devpriv->pci_dev->irq, rtd_interrupt, - IRQF_SHARED, DRV_NAME, dev)) < 0) { + ret = comedi_request_irq(devpriv->pci_dev->irq, rtd_interrupt, + IRQF_SHARED, DRV_NAME, dev); + + if (ret < 0) { printk("Could not get interrupt! (%u)\n", devpriv->pci_dev->irq); return ret; diff --git a/drivers/staging/comedi/drivers/s626.c b/drivers/staging/comedi/drivers/s626.c index 71309d3e1227..9110ae3c7fec 100644 --- a/drivers/staging/comedi/drivers/s626.c +++ b/drivers/staging/comedi/drivers/s626.c @@ -525,7 +525,8 @@ static int s626_attach(comedi_device *dev, comedi_devconfig *it) return -ENODEV; } - if ((result = comedi_pci_enable(pdev, "s626")) < 0) { + result = comedi_pci_enable(pdev, "s626"); + if (result < 0) { printk("s626_attach: comedi_pci_enable fails\n"); return -ENODEV; } @@ -552,9 +553,10 @@ static int s626_attach(comedi_device *dev, comedi_devconfig *it) /* adc buffer allocation */ devpriv->allocatedBuf = 0; - if ((devpriv->ANABuf.LogicalBase = - pci_alloc_consistent(devpriv->pdev, DMABUF_SIZE, - &appdma)) == NULL) { + devpriv->ANABuf.LogicalBase = + pci_alloc_consistent(devpriv->pdev, DMABUF_SIZE, &appdma); + + if (devpriv->ANABuf.LogicalBase == NULL) { printk("s626_attach: DMA Memory mapping error\n"); return -ENOMEM; } @@ -565,9 +567,10 @@ static int s626_attach(comedi_device *dev, comedi_devconfig *it) devpriv->allocatedBuf++; - if ((devpriv->RPSBuf.LogicalBase = - pci_alloc_consistent(devpriv->pdev, DMABUF_SIZE, - &appdma)) == NULL) { + devpriv->RPSBuf.LogicalBase = + pci_alloc_consistent(devpriv->pdev, DMABUF_SIZE, &appdma); + + if (devpriv->RPSBuf.LogicalBase == NULL) { printk("s626_attach: DMA Memory mapping error\n"); return -ENOMEM; } @@ -593,8 +596,10 @@ static int s626_attach(comedi_device *dev, comedi_devconfig *it) if (dev->irq == 0) { printk(" unknown irq (bad)\n"); } else { - if ((ret = comedi_request_irq(dev->irq, s626_irq_handler, - IRQF_SHARED, "s626", dev)) < 0) { + ret = comedi_request_irq(dev->irq, s626_irq_handler, + IRQF_SHARED, "s626", dev); + + if (ret < 0) { printk(" irq not available\n"); dev->irq = 0; } diff --git a/drivers/staging/comedi/kcomedilib/kcomedilib_main.c b/drivers/staging/comedi/kcomedilib/kcomedilib_main.c index 7133f2f2607c..94a5067f6bd5 100644 --- a/drivers/staging/comedi/kcomedilib/kcomedilib_main.c +++ b/drivers/staging/comedi/kcomedilib/kcomedilib_main.c @@ -256,7 +256,8 @@ int comedi_do_insn(comedi_t *d, comedi_insn *insn) /* XXX check lock */ - if ((ret = check_chanlist(s, 1, &insn->chanspec)) < 0) { + ret = check_chanlist(s, 1, &insn->chanspec); + if (ret < 0) { rt_printk("bad chanspec\n"); ret = -EINVAL; goto error; @@ -443,7 +444,9 @@ int comedi_cancel(comedi_t *d, unsigned int subdevice) if (!s->cancel || !s->async) return -EINVAL; - if ((ret = s->cancel(dev, s))) + ret = s->cancel(dev, s); + + if (ret) return ret; #ifdef CONFIG_COMEDI_RT -- 2.30.2