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

Commit 7af67419 authored by Chase Southwood's avatar Chase Southwood Committed by Greg Kroah-Hartman
Browse files

staging: comedi: addi_apci_1564: remove check for timer subdevice 



The only board served by this driver always has a timer, so we can init
the timer subdevice without checking first.

The boardinfo about the timer can also be removed and the data used
directly.

Signed-off-by: default avatarChase Southwood <chase.southwood@gmail.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Reviewed-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2891911a

drivers/staging/comedi/drivers/addi_apci_1564.c

+9 −18
Original line number Diff line number Diff line
@@ -15,9 +15,6 @@ static const struct addi_board apci1564_boardtypes[] = { 
		.i_NbrDoChannel		= 32,

		.i_DoMaxdata		= 0xffffffff,

		.i_Timer		= 1,

		.timer_config		= apci1564_timer_config,

		.timer_write		= apci1564_timer_write,

		.timer_read		= apci1564_timer_read,

	},

};
@@ -119,21 +116,15 @@ static int apci1564_auto_attach(struct comedi_device *dev, 


	/*  Allocate and Initialise Timer Subdevice Structures */

	s = &dev->subdevices[2];

	if (this_board->i_Timer) {

	s->type = COMEDI_SUBD_TIMER;

		s->subdev_flags = SDF_WRITEABLE | SDF_GROUND | SDF_COMMON;

	s->subdev_flags = SDF_WRITEABLE;

	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 = apci1564_timer_write;

	s->insn_read = apci1564_timer_read;

	s->insn_config = apci1564_timer_config;



	return 0;

}