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

staging: comedi: ke_counter: tidy up the subdevice init 



For aesthetics, add some whitespace to the subdevice init.

This driver does not support async commands so remove the dev->read_subdev
initialization.

Remove the commented out SDF_COMMON from the subdevice subev_flags.

Add the subdevice range_table initialization.

For aesthetics, rename the (*insn_{read,write}) functions so they have
namespace associated with the driver.

Remove the unnecessary comments about the (*insn_{read,write}) functions.

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 4761fb4e

drivers/staging/comedi/drivers/ke_counter.c

+15 −20
Original line number Diff line number Diff line
@@ -49,12 +49,9 @@ Kolter Electronic PCI Counter Card. 
#define KE_OSC_SEL_20MHZ		(3 << 0)

#define KE_DO_REG			0xfc



/*-- counter write ----------------------------------------------------------*/



/* This should be used only for resetting the counters; maybe it is better

   to make a special command 'reset'. */

static int cnt_winsn(struct comedi_device *dev,

		     struct comedi_subdevice *s, struct comedi_insn *insn,

static int ke_counter_insn_write(struct comedi_device *dev,

				 struct comedi_subdevice *s,

				 struct comedi_insn *insn,

				 unsigned int *data)

{

	int chan = CR_CHAN(insn->chanspec);
@@ -72,10 +69,9 @@ static int cnt_winsn(struct comedi_device *dev, 
	return 1;

}



/*-- counter read -----------------------------------------------------------*/



static int cnt_rinsn(struct comedi_device *dev,

		     struct comedi_subdevice *s, struct comedi_insn *insn,

static int ke_counter_insn_read(struct comedi_device *dev,

				struct comedi_subdevice *s,

				struct comedi_insn *insn,

				unsigned int *data)

{

	unsigned char a0, a1, a2, a3, a4;
@@ -115,14 +111,13 @@ static int cnt_auto_attach(struct comedi_device *dev, 
		return ret;



	s = &dev->subdevices[0];

	dev->read_subdev = s;



	s->type		= COMEDI_SUBD_COUNTER;

	s->subdev_flags = SDF_READABLE /* | SDF_COMMON */ ;

	s->subdev_flags	= SDF_READABLE;

	s->n_chan	= 3;

	s->maxdata	= 0x00ffffff;

	s->insn_read = cnt_rinsn;

	s->insn_write = cnt_winsn;

	s->range_table	= &range_unknown;

	s->insn_read	= ke_counter_insn_read;

	s->insn_write	= ke_counter_insn_write;



	outb(KE_OSC_SEL_20MHZ, dev->iobase + KE_OSC_SEL_REG);