Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 41f821d0 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7c843aa7

drivers/staging/comedi/drivers/s626.c

+3 −6
Original line number Diff line number Diff line
@@ -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);