hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
H Hartley Sweeten 2012-09-24 13:23:40 -07:00 committed by Greg Kroah-Hartman
parent 4f6c7bf992
commit 97d87e00e3
1 changed files with 29 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
drivers/staging/comedi/drivers/s626.c
View File

@ -2465,44 +2465,41 @@ static int s626_attach_pci(struct comedi_device *dev, struct pci_dev *pcidev)
if (!devpriv->base_addr) if (!devpriv->base_addr)
return -ENOMEM; return -ENOMEM;
if (devpriv->base_addr) { /* disable master interrupt */
/* disable master interrupt */ writel(0, devpriv->base_addr + P_IER);
writel(0, devpriv->base_addr + P_IER);
/* soft reset */ /* soft reset */
writel(MC1_SOFT_RESET, devpriv->base_addr + P_MC1); writel(MC1_SOFT_RESET, devpriv->base_addr + P_MC1);
/* DMA FIXME DMA// */ /* DMA FIXME DMA// */
/* adc buffer allocation */ /* adc buffer allocation */
devpriv->allocatedBuf = 0; devpriv->allocatedBuf = 0;
devpriv->ANABuf.LogicalBase = devpriv->ANABuf.LogicalBase =
pci_alloc_consistent(pcidev, DMABUF_SIZE, &appdma); 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;
devpriv->allocatedBuf++;
devpriv->RPSBuf.LogicalBase =
pci_alloc_consistent(pcidev, DMABUF_SIZE, &appdma);
if (devpriv->RPSBuf.LogicalBase == NULL) {
printk(KERN_ERR "s626_attach: DMA Memory mapping error\n");
return -ENOMEM;
}
devpriv->RPSBuf.PhysicalBase = appdma;
devpriv->allocatedBuf++;
if (devpriv->ANABuf.LogicalBase == NULL) {
printk(KERN_ERR "s626_attach: DMA Memory mapping error\n");
return -ENOMEM;
} }
devpriv->ANABuf.PhysicalBase = appdma;
devpriv->allocatedBuf++;
devpriv->RPSBuf.LogicalBase =
pci_alloc_consistent(pcidev, DMABUF_SIZE, &appdma);
if (devpriv->RPSBuf.LogicalBase == NULL) {
printk(KERN_ERR "s626_attach: DMA Memory mapping error\n");
return -ENOMEM;
}
devpriv->RPSBuf.PhysicalBase = appdma;
devpriv->allocatedBuf++;
ret = comedi_alloc_subdevices(dev, 6); ret = comedi_alloc_subdevices(dev, 6);
if (ret) if (ret)
return ret; return ret;
@ -2599,7 +2596,7 @@ static int s626_attach_pci(struct comedi_device *dev, struct pci_dev *pcidev)
/* stop ai_command */ /* stop ai_command */
devpriv->ai_cmd_running = 0; devpriv->ai_cmd_running = 0;
if (devpriv->base_addr && (devpriv->allocatedBuf == 2)) { if (devpriv->allocatedBuf == 2) {
dma_addr_t pPhysBuf; dma_addr_t pPhysBuf;
uint16_t chan; uint16_t chan;