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

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

staging: comedi: addi_apci_1564: remove apci1564_do_config 



The DO config function served the purpose of configuring the diagnostic
interrupts for the board.  As the driver currently does not support
diagnostic interrupts, the digital output subdevice does not need an
insn_config operation and this function can be safely removed.

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

drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c

+0 −34
Original line number Diff line number Diff line
@@ -87,40 +87,6 @@ 
#define APCI1564_TCW_WARN_TIMEVAL_REG(x)		(0x18 + ((x) * 0x20))

#define APCI1564_TCW_WARN_TIMEBASE_REG(x)		(0x1c + ((x) * 0x20))



/*

 * Configures The Digital Output Subdevice.

 *

 * data[1] 0 = Disable VCC Interrupt, 1 = Enable VCC Interrupt

 * data[2] 0 = Disable CC Interrupt, 1 = Enable CC Interrupt

 */

static int apci1564_do_config(struct comedi_device *dev,

			      struct comedi_subdevice *s,

			      struct comedi_insn *insn,

			      unsigned int *data)

{

	struct apci1564_private *devpriv = dev->private;

	unsigned int ul_Command = 0;



	if ((data[0] != 0) && (data[0] != 1)) {

		dev_err(dev->class_dev, "Data should be 1 or 0\n");

		return -EINVAL;

	}



	if (data[1] == 1)

		ul_Command = ul_Command | 0x1;

	else

		ul_Command = ul_Command & 0xFFFFFFFE;



	if (data[2] == 1)

		ul_Command = ul_Command | 0x2;

	else

		ul_Command = ul_Command & 0xFFFFFFFD;



	outl(ul_Command, devpriv->amcc_iobase + APCI1564_DO_INT_CTRL_REG);

	devpriv->tsk_current = current;

	return insn->n;

}



/*

 * Configures The Timer, Counter or Watchdog

 *

drivers/staging/comedi/drivers/addi_apci_1564.c

+0 −1
Original line number Diff line number Diff line
@@ -388,7 +388,6 @@ static int apci1564_auto_attach(struct comedi_device *dev, 
	s->n_chan = 32;

	s->maxdata = 1;

	s->range_table = &range_digital;

	s->insn_config = apci1564_do_config;

	s->insn_bits = apci1564_do_insn_bits;



	/* Change-Of-State (COS) interrupt subdevice */