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

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

staging: comedi: addi_apci_3501: board has a timer 



The board supported by this driver has a timer device. Remove the
conditional and always init the subdevice.

Also, move the subdevice insn_* function pointers out of the
boardinfo and use them to initialize the subdevice directly.

Since devpriv->s_EeParameters.i_Timer is not longer being used,
remove its initialization also.

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 2a836ad7

drivers/staging/comedi/drivers/addi_apci_3501.c

+9 −20
Original line number Diff line number Diff line
@@ -21,16 +21,12 @@ static const struct addi_board apci3501_boardtypes[] = { 
		.i_NbrDiChannel		= 2,

		.i_NbrDoChannel		= 2,

		.i_DoMaxdata		= 0x3,

		.i_Timer		= 1,

		.interrupt		= v_APCI3501_Interrupt,

		.reset			= i_APCI3501_Reset,

		.ao_config		= i_APCI3501_ConfigAnalogOutput,

		.ao_write		= i_APCI3501_WriteAnalogOutput,

		.di_bits		= apci3501_di_insn_bits,

		.do_bits		= apci3501_do_insn_bits,

		.timer_config		= i_APCI3501_ConfigTimerCounterWatchdog,

		.timer_write		= i_APCI3501_StartStopWriteTimerCounterWatchdog,

		.timer_read		= i_APCI3501_ReadTimerCounterWatchdog,

	},

};
@@ -139,7 +135,6 @@ static int apci3501_auto_attach(struct comedi_device *dev, 
	devpriv->s_EeParameters.i_NbrDoChannel = this_board->i_NbrDoChannel;

	devpriv->s_EeParameters.i_DoMaxdata = this_board->i_DoMaxdata;

	devpriv->s_EeParameters.i_Dma = this_board->i_Dma;

	devpriv->s_EeParameters.i_Timer = this_board->i_Timer;

	devpriv->s_EeParameters.ui_MinAcquisitiontimeNs =

		this_board->ui_MinAcquisitiontimeNs;

	devpriv->s_EeParameters.ui_MinDelaytimeNs =
@@ -269,21 +264,15 @@ static int apci3501_auto_attach(struct comedi_device *dev, 


	/*  Allocate and Initialise Timer Subdevice Structures */

	s = &dev->subdevices[4];

	if (devpriv->s_EeParameters.i_Timer) {

	s->type = COMEDI_SUBD_TIMER;

	s->subdev_flags = SDF_WRITEABLE | SDF_GROUND | SDF_COMMON;

	s->n_chan = 1;

	s->maxdata = 0;

	s->len_chanlist = 1;

	s->range_table = &range_digital;



		s->insn_write = this_board->timer_write;

		s->insn_read = this_board->timer_read;

		s->insn_config = this_board->timer_config;

		s->insn_bits = this_board->timer_bits;

	} else {

		s->type = COMEDI_SUBD_UNUSED;

	}

	s->insn_write = i_APCI3501_StartStopWriteTimerCounterWatchdog;

	s->insn_read = i_APCI3501_ReadTimerCounterWatchdog;

	s->insn_config = i_APCI3501_ConfigTimerCounterWatchdog;



	/*  Allocate and Initialise TTL */

	s = &dev->subdevices[5];