diff options
| author | H Hartley Sweeten <hartleys@visionengravers.com> | 2012-09-24 13:23:40 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-26 09:37:30 -0700 |
| commit | 97d87e00e3d6bdc8f3de606dd7cc5aa149709435 (patch) | |
| tree | 4d7963a08535da2b7ecbecbd600dd471667660ce /drivers/staging | |
| parent | 4f6c7bf992bc6f1bbf38b08e9b3c8a21865888f2 (diff) | |
staging: comedi: s626: remove unnecessary checks of 'devpriv->base_addr'
'devpriv->base_addr' is valid from this point on in the attach_pci()
function. Remove the unnecessary checks.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/comedi/drivers/s626.c | 51 |
1 files changed, 24 insertions, 27 deletions
diff --git a/drivers/staging/comedi/drivers/s626.c b/drivers/staging/comedi/drivers/s626.c index 6f6c808509c..a9d78c72140 100644 --- a/drivers/staging/comedi/drivers/s626.c +++ b/drivers/staging/comedi/drivers/s626.c @@ -2465,43 +2465,40 @@ static int s626_attach_pci(struct comedi_device *dev, struct pci_dev *pcidev) if (!devpriv->base_addr) return -ENOMEM; - if (devpriv->base_addr) { - /* disable master interrupt */ - writel(0, devpriv->base_addr + P_IER); + /* disable master interrupt */ + writel(0, devpriv->base_addr + P_IER); - /* soft reset */ - writel(MC1_SOFT_RESET, devpriv->base_addr + P_MC1); + /* soft reset */ + writel(MC1_SOFT_RESET, devpriv->base_addr + P_MC1); - /* DMA FIXME DMA// */ + /* DMA FIXME DMA// */ - /* adc buffer allocation */ - devpriv->allocatedBuf = 0; + /* adc buffer allocation */ + devpriv->allocatedBuf = 0; - devpriv->ANABuf.LogicalBase = - pci_alloc_consistent(pcidev, DMABUF_SIZE, &appdma); + devpriv->ANABuf.LogicalBase = + pci_alloc_consistent(pcidev, DMABUF_SIZE, &appdma); - if (devpriv->ANABuf.LogicalBase == NULL) { - printk(KERN_ERR "s626_attach: DMA Memory mapping error\n"); - return -ENOMEM; - } - - devpriv->ANABuf.PhysicalBase = appdma; + if (devpriv->ANABuf.LogicalBase == NULL) { + printk(KERN_ERR "s626_attach: DMA Memory mapping error\n"); + return -ENOMEM; + } - devpriv->allocatedBuf++; + devpriv->ANABuf.PhysicalBase = appdma; - devpriv->RPSBuf.LogicalBase = - pci_alloc_consistent(pcidev, DMABUF_SIZE, &appdma); + devpriv->allocatedBuf++; - if (devpriv->RPSBuf.LogicalBase == NULL) { - printk(KERN_ERR "s626_attach: DMA Memory mapping error\n"); - return -ENOMEM; - } + devpriv->RPSBuf.LogicalBase = + pci_alloc_consistent(pcidev, DMABUF_SIZE, &appdma); - devpriv->RPSBuf.PhysicalBase = appdma; + if (devpriv->RPSBuf.LogicalBase == NULL) { + printk(KERN_ERR "s626_attach: DMA Memory mapping error\n"); + return -ENOMEM; + } - devpriv->allocatedBuf++; + devpriv->RPSBuf.PhysicalBase = appdma; - } + devpriv->allocatedBuf++; ret = comedi_alloc_subdevices(dev, 6); if (ret) @@ -2599,7 +2596,7 @@ static int s626_attach_pci(struct comedi_device *dev, struct pci_dev *pcidev) /* stop ai_command */ devpriv->ai_cmd_running = 0; - if (devpriv->base_addr && (devpriv->allocatedBuf == 2)) { + if (devpriv->allocatedBuf == 2) { dma_addr_t pPhysBuf; uint16_t chan; |