aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH Hartley Sweeten <hartleys@visionengravers.com>2012-09-24 16:22:50 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-09-26 12:37:30 -0400
commit41f821d07729d1c3d59d1ebebf4c57e2ffe0a37c (patch)
treec3244278ad8f193adbb9a52b5a836a52cd0a092a
parent7c843aa7731c774a78a31b6dab371024c4756d38 (diff)
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>
-rw-r--r--drivers/staging/comedi/drivers/s626.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/staging/comedi/drivers/s626.c b/drivers/staging/comedi/drivers/s626.c
index fb215b24fce8..93e55c314598 100644
--- a/drivers/staging/comedi/drivers/s626.c
+++ b/drivers/staging/comedi/drivers/s626.c
@@ -2445,7 +2445,6 @@ static int s626_attach_pci(struct comedi_device *dev, struct pci_dev *pcidev)
2445/* uint16_t StartVal; */ 2445/* uint16_t StartVal; */
2446/* uint16_t index; */ 2446/* uint16_t index; */
2447/* unsigned int data[16]; */ 2447/* unsigned int data[16]; */
2448 int result;
2449 int i; 2448 int i;
2450 int ret; 2449 int ret;
2451 resource_size_t resourceStart; 2450 resource_size_t resourceStart;
@@ -2458,11 +2457,9 @@ static int s626_attach_pci(struct comedi_device *dev, struct pci_dev *pcidev)
2458 if (alloc_private(dev, sizeof(struct s626_private)) < 0) 2457 if (alloc_private(dev, sizeof(struct s626_private)) < 0)
2459 return -ENOMEM; 2458 return -ENOMEM;
2460 2459
2461 result = comedi_pci_enable(pcidev, dev->board_name); 2460 ret = comedi_pci_enable(pcidev, dev->board_name);
2462 if (result < 0) { 2461 if (ret)
2463 printk(KERN_ERR "s626_attach: comedi_pci_enable fails\n"); 2462 return ret;
2464 return -ENODEV;
2465 }
2466 devpriv->got_regions = 1; 2463 devpriv->got_regions = 1;
2467 2464
2468 resourceStart = pci_resource_start(pcidev, 0); 2465 resourceStart = pci_resource_start(pcidev, 0);