diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-12-19 16:32:08 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-20 11:49:34 -0800 |
| commit | 01b6442b4639a0165880aefeec5342df37e02aa8 (patch) | |
| tree | 1f051ebf5af4171bbf7b475e8d2cfe790a502f65 | |
| parent | d783a20e8f2ada1b0b443ddf09e7e700d20b18dc (diff) | |
staging: comedi: ni_660x: tidy up set_tio_counterswap()
Clean up the multi-line comment and tidy the function a bit.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_660x.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/drivers/staging/comedi/drivers/ni_660x.c b/drivers/staging/comedi/drivers/ni_660x.c index 40402c14ba93..df42e3906171 100644 --- a/drivers/staging/comedi/drivers/ni_660x.c +++ b/drivers/staging/comedi/drivers/ni_660x.c @@ -767,17 +767,20 @@ static int ni_660x_cancel(struct comedi_device *dev, struct comedi_subdevice *s) return retval; } -static void set_tio_counterswap(struct comedi_device *dev, int chipset) +static void set_tio_counterswap(struct comedi_device *dev, int chip) { - /* See P. 3.5 of the Register-Level Programming manual. The - CounterSwap bit has to be set on the second chip, otherwise - it will try to use the same pins as the first chip. + unsigned bits = 0; + + /* + * See P. 3.5 of the Register-Level Programming manual. + * The CounterSwap bit has to be set on the second chip, + * otherwise it will try to use the same pins as the + * first chip. */ - if (chipset) - ni_660x_write_register(dev, chipset, CounterSwap, - NI660X_CLK_CFG); - else - ni_660x_write_register(dev, chipset, 0, NI660X_CLK_CFG); + if (chip) + bits = CounterSwap; + + ni_660x_write_register(dev, chip, bits, NI660X_CLK_CFG); } static void ni_660x_handle_gpct_interrupt(struct comedi_device *dev, |