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

Commit d35a73e0 authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman
Browse files

staging: comedi: amplc_pc263: Change DIO subdevice to DO 



This is a relay output card with no inputs.  It's single subdevice is
currently a digital input/output subdevice (COMEDI_SUBD_DIO).  It should
really be a digital output subdevice (COMEDI_SUBD_DO).  Change the
subdevice type and remove the insn_config() hook as it doesn't do
anything useful.

Signed-off-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9f989000

drivers/staging/comedi/drivers/amplc_pc263.c

+9 −29
Original line number Diff line number Diff line
@@ -154,10 +154,7 @@ static struct comedi_driver driver_amplc_pc263 = { 
static int pc263_request_region(unsigned minor, unsigned long from,

				unsigned long extent);

#endif

static int pc263_dio_insn_bits(struct comedi_device *dev,

			       struct comedi_subdevice *s,

			       struct comedi_insn *insn, unsigned int *data);

static int pc263_dio_insn_config(struct comedi_device *dev,

static int pc263_do_insn_bits(struct comedi_device *dev,

			      struct comedi_subdevice *s,

			      struct comedi_insn *insn, unsigned int *data);
@@ -319,16 +316,13 @@ static int pc263_attach(struct comedi_device *dev, struct comedi_devconfig *it) 
	}



	s = dev->subdevices + 0;

	/* digital i/o subdevice */

	s->type = COMEDI_SUBD_DIO;

	/* digital output subdevice */

	s->type = COMEDI_SUBD_DO;

	s->subdev_flags = SDF_READABLE | SDF_WRITABLE;

	s->n_chan = 16;

	s->maxdata = 1;

	s->range_table = &range_digital;

	s->insn_bits = pc263_dio_insn_bits;

	s->insn_config = pc263_dio_insn_config;

	/* all outputs */

	s->io_bits = 0xffff;

	s->insn_bits = pc263_do_insn_bits;

	/* read initial relay state */

	s->state = inb(dev->iobase) | (inb(dev->iobase + 1) << 8);
@@ -391,12 +385,7 @@ static int pc263_request_region(unsigned minor, unsigned long from, 
}

#endif



/* DIO devices are slightly special.  Although it is possible to

 * implement the insn_read/insn_write interface, it is much more

 * useful to applications if you implement the insn_bits interface.

 * This allows packed reading/writing of the DIO channels.  The

 * comedi core can convert between insn_bits and insn_read/write */

static int pc263_dio_insn_bits(struct comedi_device *dev,

static int pc263_do_insn_bits(struct comedi_device *dev,

			      struct comedi_subdevice *s,

			      struct comedi_insn *insn, unsigned int *data)

{
@@ -422,15 +411,6 @@ static int pc263_dio_insn_bits(struct comedi_device *dev, 
	return 2;

}



static int pc263_dio_insn_config(struct comedi_device *dev,

				 struct comedi_subdevice *s,

				 struct comedi_insn *insn, unsigned int *data)

{

	if (insn->n != 1)

		return -EINVAL;

	return 1;

}



/*

 * A convenient macro that defines init_module() and cleanup_module(),

 * as necessary.