From f300fab2fcc281ef5b975ba0af9abd4a88af8599 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Fri, 5 Sep 2014 09:25:37 -0700 Subject: [PATCH] staging: comedi: adl_pci9118: move digitial input (*insn_bits) function For aesthetics, move the digital inputs (*insn_bits) function so it is not located in the middle of the analog input functions. Also, rename it for consistency. Signed-off-by: H Hartley Sweeten Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/adl_pci9118.c | 32 ++++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/drivers/staging/comedi/drivers/adl_pci9118.c b/drivers/staging/comedi/drivers/adl_pci9118.c index c758a467aad4..b89021ff6080 100644 --- a/drivers/staging/comedi/drivers/adl_pci9118.c +++ b/drivers/staging/comedi/drivers/adl_pci9118.c @@ -551,21 +551,6 @@ static int pci9118_insn_read_ao(struct comedi_device *dev, return n; } -static int pci9118_insn_bits_di(struct comedi_device *dev, - struct comedi_subdevice *s, - struct comedi_insn *insn, - unsigned int *data) -{ - /* - * The digital inputs and outputs share the read register. - * bits [7:4] are the digital outputs - * bits [3:0] are the digital inputs - */ - data[1] = inl(dev->iobase + PCI9118_DIO_REG) & 0xf; - - return insn->n; -} - static void interrupt_pci9118_ai_mode4_switch(struct comedi_device *dev) { struct pci9118_private *devpriv = dev->private; @@ -1648,6 +1633,21 @@ static int pci9118_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) return ret; } +static int pci9118_di_insn_bits(struct comedi_device *dev, + struct comedi_subdevice *s, + struct comedi_insn *insn, + unsigned int *data) +{ + /* + * The digital inputs and outputs share the read register. + * bits [7:4] are the digital outputs + * bits [3:0] are the digital inputs + */ + data[1] = inl(dev->iobase + PCI9118_DIO_REG) & 0xf; + + return insn->n; +} + static int pci9118_do_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, struct comedi_insn *insn, @@ -1895,7 +1895,7 @@ static int pci9118_common_attach(struct comedi_device *dev, int disable_irq, s->n_chan = 4; s->maxdata = 1; s->range_table = &range_digital; - s->insn_bits = pci9118_insn_bits_di; + s->insn_bits = pci9118_di_insn_bits; /* Digital Output subdevice */ s = &dev->subdevices[3]; -- 2.20.1