leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: comedi: ni_tio: tidy up ni_tio_read_sw_save_reg()

Browse Source 
Remove the need for some of the local variables.

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>
This commit is contained in:
H Hartley Sweeten 2014-07-28 10:26:46 -07:00 committed by Greg Kroah-Hartman
parent f57f5848f9
commit 56bd1ac708
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/staging/comedi/drivers/ni_tio.c
View File

@ -1266,9 +1266,7 @@ static unsigned int ni_tio_read_sw_save_reg(struct comedi_device *dev,
{
struct ni_gpct *counter = s->private;
unsigned cidx = counter->counter_index;
unsigned int first_read;
unsigned int second_read;
unsigned int correct_read;
unsigned int val;
ni_tio_set_bits(counter, NITIO_CMD_REG(cidx), Gi_Save_Trace_Bit, 0);
ni_tio_set_bits(counter, NITIO_CMD_REG(cidx),
@ -1283,14 +1281,11 @@ static unsigned int ni_tio_read_sw_save_reg(struct comedi_device *dev,
* will be correct since the count value will definitely have latched
* by then.
*/
first_read = read_register(counter, NITIO_SW_SAVE_REG(cidx));
second_read = read_register(counter, NITIO_SW_SAVE_REG(cidx));
if (first_read != second_read)
correct_read = read_register(counter, NITIO_SW_SAVE_REG(cidx));
else
correct_read = first_read;
val = read_register(counter, NITIO_SW_SAVE_REG(cidx));
if (val != read_register(counter, NITIO_SW_SAVE_REG(cidx)))
val = read_register(counter, NITIO_SW_SAVE_REG(cidx));
return correct_read;
return val;
}
int ni_tio_insn_read(struct comedi_device *dev,