Commit 97d87e00 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4f6c7bf9
......@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment