From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Mon, 24 Sep 2012 20:22:50 +0000 (-0700)
Subject: staging: comedi: s626: remove unneeded local variable in attach_pci()
X-Git-Tag: firefly_0821_release~3680^2~1977^2~27
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=41f821d07729d1c3d59d1ebebf4c57e2ffe0a37c;p=firefly-linux-kernel-4.4.55.git

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>
---

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)
 /*   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);