]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging: comedi: s626: remove unneeded local variable in attach_pci()
authorH Hartley Sweeten <hartleys@visionengravers.com>
Mon, 24 Sep 2012 20:22:50 +0000 (13:22 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 26 Sep 2012 16:37:30 +0000 (09:37 -0700)
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>
drivers/staging/comedi/drivers/s626.c

index fb215b24fce8bb19ee6708893a3502a75518bd16..93e55c3145980ed1b82c848106e8261cff8fb062 100644 (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);