aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorH Hartley Sweeten <hartleys@visionengravers.com>2012-06-22 19:34:57 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-06-22 23:55:09 -0400
commitc11a1ea71bf2ce9a75a7071c785220a42f4c922a (patch)
tree7bd34fd35838bf12f8dcd477852aa62d040d1730 /drivers
parent4fb209a56960bad241b41b0e0e451b6346b6aee4 (diff)
staging: comedi: ni_daq_700: use a local var to fix a > 80 char line issue
The 'data[1] = ...' line is currently kept < 80 chars by breaking a pointer access after the '->'. This makes the code a bit confusing to follow. Use a local variable to shorten the line and make it clearer. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Cc: Ian Abbott <abbotti@mev.co.uk> Cc: Frank Mori Hess <fmhess@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/comedi/drivers/ni_daq_700.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/staging/comedi/drivers/ni_daq_700.c b/drivers/staging/comedi/drivers/ni_daq_700.c
index 4978cd374a53..2ea3c8d5194c 100644
--- a/drivers/staging/comedi/drivers/ni_daq_700.c
+++ b/drivers/staging/comedi/drivers/ni_daq_700.c
@@ -80,6 +80,7 @@ static int subdev_700_insn_config(struct comedi_device *dev,
80 struct comedi_subdevice *s, 80 struct comedi_subdevice *s,
81 struct comedi_insn *insn, unsigned int *data) 81 struct comedi_insn *insn, unsigned int *data)
82{ 82{
83 unsigned int chan = 1 << CR_CHAN(insn->chanspec);
83 84
84 switch (data[0]) { 85 switch (data[0]) {
85 case INSN_CONFIG_DIO_INPUT: 86 case INSN_CONFIG_DIO_INPUT:
@@ -87,10 +88,7 @@ static int subdev_700_insn_config(struct comedi_device *dev,
87 case INSN_CONFIG_DIO_OUTPUT: 88 case INSN_CONFIG_DIO_OUTPUT:
88 break; 89 break;
89 case INSN_CONFIG_DIO_QUERY: 90 case INSN_CONFIG_DIO_QUERY:
90 data[1] = 91 data[1] = (s->io_bits & chan) ? COMEDI_OUTPUT : COMEDI_INPUT;
91 (s->
92 io_bits & (1 << CR_CHAN(insn->chanspec))) ? COMEDI_OUTPUT :
93 COMEDI_INPUT;
94 return insn->n; 92 return insn->n;
95 break; 93 break;
96 default: 94 default: