* [PATCH 7/7] staging: comedi: contec_pci_dio: cleanup contec_do_insn_bits
@ 2012-08-16 0:32 H Hartley Sweeten
0 siblings, 0 replies; only message in thread
From: H Hartley Sweeten @ 2012-08-16 0:32 UTC (permalink / raw)
To: Linux Kernel; +Cc: devel, abbotti, gregkh
Create local variables for the mask and bits values passed in
the data pointer to make this function a bit clearer.
Return the state of the output bits (s->state) in data[1] since
this is what comedilib is expecting.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Greg Kroah-hartman <gregkh@linuxfoundation.org>
---
drivers/staging/comedi/drivers/contec_pci_dio.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/comedi/drivers/contec_pci_dio.c b/drivers/staging/comedi/drivers/contec_pci_dio.c
index b7b60d3..12ad9fa3 100644
--- a/drivers/staging/comedi/drivers/contec_pci_dio.c
+++ b/drivers/staging/comedi/drivers/contec_pci_dio.c
@@ -44,12 +44,18 @@ static int contec_do_insn_bits(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data)
{
- if (data[0]) {
- s->state &= ~data[0];
- s->state |= data[0] & data[1];
+ unsigned int mask = data[0];
+ unsigned int bits = data[1];
+
+ if (mask) {
+ s->state &= ~mask;
+ s->state |= (bits & mask);
outw(s->state, dev->iobase + PIO1616L_DO_REG);
}
+
+ data[1] = s->state;
+
return insn->n;
}
--
1.7.11
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2012-08-16 0:33 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-08-16 0:32 [PATCH 7/7] staging: comedi: contec_pci_dio: cleanup contec_do_insn_bits H Hartley Sweeten
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).