openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: comedi: s626: remove unneeded local variable in attach_pci() 

The 'result' variable is only used to check the return from
comedi_pci_enable(). Just reuse the 'ret' variable.

Also, remove the kernel noise and use the error code from
comedi_pci_enable() instead of returning -ENODEV.

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:22:50 -07:00 committed by Greg Kroah-Hartman
parent 7c843aa773
commit 41f821d077
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2445,7 +2445,6 @@ static int s626_attach_pci(struct comedi_device *dev, struct pci_dev *pcidev)
/* uint16_t StartVal; */
/* uint16_t index; */
/* unsigned int data[16]; */
int result;
int i;
int ret;
resource_size_t resourceStart;
@ -2458,11 +2457,9 @@ static int s626_attach_pci(struct comedi_device *dev, struct pci_dev *pcidev)
if (alloc_private(dev, sizeof(struct s626_private)) < 0)
return -ENOMEM;
result = comedi_pci_enable(pcidev, dev->board_name);
if (result < 0) {
printk(KERN_ERR "s626_attach: comedi_pci_enable fails\n");
return -ENODEV;
}
ret = comedi_pci_enable(pcidev, dev->board_name);
if (ret)
return ret;
devpriv->got_regions = 1;
resourceStart = pci_resource_start(pcidev, 0);