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

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

staging: comedi: addi_apci_2200: remove devpriv allocation 



The 'devpriv' is not used in this driver. Remove it's allocation
in the auto_attach and the check for it in the detach.

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

drivers/staging/comedi/drivers/addi_apci_2200.c

+2 −11
Original line number Diff line number Diff line
@@ -81,7 +81,6 @@ static int apci2200_auto_attach(struct comedi_device *dev, 
{

	struct pci_dev *pcidev = comedi_to_pci_dev(dev);

	const struct addi_board *this_board;

	struct addi_private *devpriv;

	struct comedi_subdevice *s;

	int ret, n_subdevices;
@@ -91,11 +90,6 @@ static int apci2200_auto_attach(struct comedi_device *dev, 
	dev->board_ptr = this_board;

	dev->board_name = this_board->pc_DriverName;



	devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);

	if (!devpriv)

		return -ENOMEM;

	dev->private = devpriv;



	ret = comedi_pci_enable(pcidev, dev->board_name);

	if (ret)

		return ret;
@@ -154,12 +148,9 @@ static int apci2200_auto_attach(struct comedi_device *dev, 
static void apci2200_detach(struct comedi_device *dev)

{

	struct pci_dev *pcidev = comedi_to_pci_dev(dev);

	struct addi_private *devpriv = dev->private;



	if (devpriv) {

	if (dev->iobase)

		apci2200_reset(dev);

	}

	if (dev->subdevices)

		addi_watchdog_cleanup(&dev->subdevices[4]);

	if (pcidev) {