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

Commit 99ac7ccc authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "staging: comedi: core: introduce comedi_dio_insn_config()" 



This reverts commit 4f76463d.

I applied an incorrect version here as well :(

Cc: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5dacadcc

drivers/staging/comedi/comedidev.h

+0 −4
Original line number Diff line number Diff line
@@ -342,10 +342,6 @@ void comedi_buf_memcpy_from(struct comedi_async *async, unsigned int offset, 


/* drivers.c - general comedi driver functions */



int comedi_dio_insn_config(struct comedi_device *, struct comedi_subdevice *,

			   struct comedi_insn *, unsigned int *data,

			   unsigned int mask);



void *comedi_alloc_devpriv(struct comedi_device *, size_t);

int comedi_alloc_subdevices(struct comedi_device *, int);

drivers/staging/comedi/drivers.c

+0 −40
Original line number Diff line number Diff line
@@ -150,46 +150,6 @@ int insn_inval(struct comedi_device *dev, struct comedi_subdevice *s, 
	return -EINVAL;

}



/**

 * comedi_dio_insn_config() - boilerplate (*insn_config) for DIO subdevices.

 * @dev: comedi_device struct

 * @s: comedi_subdevice struct

 * @insn: comedi_insn struct

 * @data: parameters for the @insn

 * @mask: io_bits mask for grouped channels

 */

int comedi_dio_insn_config(struct comedi_device *dev,

			   struct comedi_subdevice *s,

			   struct comedi_insn *insn,

			   unsigned int *data,

			   unsigned int mask)

{

	unsigned int chan_mask = 1 << CR_CHAN(insn->chanspec);



	if (!mask)

		mask = chan_mask;



	switch (data[0]) {

	case INSN_CONFIG_DIO_INPUT:

		s->io_bits &= ~mask;

		break;



	case INSN_CONFIG_DIO_OUTPUT:

		s->io_bits |= mask;

		break;



	case INSN_CONFIG_DIO_QUERY:

		data[1] = (s->io_bits & mask) ? COMEDI_OUTPUT : COMEDI_INPUT;

		return insn->n;



	default:

		return -EINVAL;

	}



	return 0;

}

EXPORT_SYMBOL_GPL(comedi_dio_insn_config);



static int insn_rw_emulate_bits(struct comedi_device *dev,

				struct comedi_subdevice *s,

				struct comedi_insn *insn, unsigned int *data)