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

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

staging: comedi: addi_apci_1500: remove unnecessary subdevice initialization 



The subdevices that don't initialize any of the callbacks don't really
exist. Remove the unnecessary initialzation and just set the type to
COMEDI_SUBD_UNUSED.

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 a6b5d2a2

drivers/staging/comedi/drivers/addi_apci_1500.c

+2 −26
Original line number Diff line number Diff line
@@ -116,36 +116,12 @@ static int apci1500_auto_attach(struct comedi_device *dev, 


	/*  Allocate and Initialise AI Subdevice Structures */

	s = &dev->subdevices[0];

	if ((devpriv->s_EeParameters.i_NbrAiChannel)

		|| (this_board->i_NbrAiChannelDiff)) {

		dev->read_subdev = s;

		s->type = COMEDI_SUBD_AI;

		s->subdev_flags =

			SDF_READABLE | SDF_COMMON | SDF_GROUND

			| SDF_DIFF;

		if (devpriv->s_EeParameters.i_NbrAiChannel)

			s->n_chan = devpriv->s_EeParameters.i_NbrAiChannel;

		else

			s->n_chan = this_board->i_NbrAiChannelDiff;

		s->maxdata = devpriv->s_EeParameters.i_AiMaxdata;

		s->len_chanlist = this_board->i_AiChannelList;

		s->range_table = this_board->pr_AiRangelist;

	} else {

	s->type = COMEDI_SUBD_UNUSED;

	}



	/*  Allocate and Initialise AO Subdevice Structures */

	s = &dev->subdevices[1];

	if (devpriv->s_EeParameters.i_NbrAoChannel) {

		s->type = COMEDI_SUBD_AO;

		s->subdev_flags = SDF_WRITEABLE | SDF_GROUND | SDF_COMMON;

		s->n_chan = devpriv->s_EeParameters.i_NbrAoChannel;

		s->maxdata = devpriv->s_EeParameters.i_AoMaxdata;

		s->len_chanlist =

			devpriv->s_EeParameters.i_NbrAoChannel;

	} else {

		s->type = COMEDI_SUBD_UNUSED;

	}



	/*  Allocate and Initialise DI Subdevice Structures */

	s = &dev->subdevices[2];

	if (devpriv->s_EeParameters.i_NbrDiChannel) {