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

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

staging: comedi: addi_apci_1500: remove unused subdevices 



Only allocate space for the subdevicess used by the driver. Remove all
the COMEDI_SUBD_UNUSED subdevices.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 35ce3c3c

drivers/staging/comedi/drivers/addi_apci_1500.c

+5 −17
Original line number Diff line number Diff line
@@ -110,20 +110,12 @@ static int apci1500_auto_attach(struct comedi_device *dev, 
		addi_eeprom_read_info(dev, pci_resource_start(pcidev, 0));

	}



	ret = comedi_alloc_subdevices(dev, 7);

	ret = comedi_alloc_subdevices(dev, 4);

	if (ret)

		return ret;



	/*  Allocate and Initialise AI Subdevice Structures */

	s = &dev->subdevices[0];

	s->type = COMEDI_SUBD_UNUSED;



	/*  Allocate and Initialise AO Subdevice Structures */

	s = &dev->subdevices[1];

		s->type = COMEDI_SUBD_UNUSED;



	/*  Allocate and Initialise DI Subdevice Structures */

	s = &dev->subdevices[2];

	s = &dev->subdevices[0];

	if (devpriv->s_EeParameters.i_NbrDiChannel) {

		s->type = COMEDI_SUBD_DI;

		s->subdev_flags = SDF_READABLE | SDF_GROUND | SDF_COMMON;
@@ -140,7 +132,7 @@ static int apci1500_auto_attach(struct comedi_device *dev, 
		s->type = COMEDI_SUBD_UNUSED;

	}

	/*  Allocate and Initialise DO Subdevice Structures */

	s = &dev->subdevices[3];

	s = &dev->subdevices[1];

	if (devpriv->s_EeParameters.i_NbrDoChannel) {

		s->type = COMEDI_SUBD_DO;

		s->subdev_flags =
@@ -158,7 +150,7 @@ static int apci1500_auto_attach(struct comedi_device *dev, 
	}



	/*  Allocate and Initialise Timer Subdevice Structures */

	s = &dev->subdevices[4];

	s = &dev->subdevices[2];

	if (devpriv->s_EeParameters.i_Timer) {

		s->type = COMEDI_SUBD_TIMER;

		s->subdev_flags = SDF_WRITEABLE | SDF_GROUND | SDF_COMMON;
@@ -174,12 +166,8 @@ static int apci1500_auto_attach(struct comedi_device *dev, 
		s->type = COMEDI_SUBD_UNUSED;

	}



	/*  Allocate and Initialise TTL */

	s = &dev->subdevices[5];

	s->type = COMEDI_SUBD_UNUSED;



	/* EEPROM */

	s = &dev->subdevices[6];

	s = &dev->subdevices[3];

	if (this_board->i_PCIEeprom) {

		s->type = COMEDI_SUBD_MEMORY;

		s->subdev_flags = SDF_READABLE | SDF_INTERNAL;