diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2014-07-18 17:01:16 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-21 14:43:01 -0700 |
| commit | a207c12f62e8b53e1e1600ca384b13a39a9feed2 (patch) | |
| tree | ed32cfa28deb3711f6b3e2b86319cdeffacb8ab9 /drivers/staging/comedi/drivers/ni_at_a2150.c | |
| parent | 79014eb1f25e145ea0dc70c628d1ad24106afba3 (diff) | |
staging: comedi: drivers: cleanup cmd->flags use
Most of the comedi drivers that support async commands have some sort
of timer to control the acquisition timing. For these drivers, Step 4
of the (*do_cmdtest) operations calls a ns_to_timer() function that
converts the desired ns time of the command into a value used to set
the timer. These ns_to_timer() functions also typically pass the
cmd->flags in order to determine the desired rounding mode.
Some of the drivers mask the cmd->flags with TRIG_ROUND_MASK when
calling the ns_to_timer() functions. Move all the masking into the
ns_to_timer() functions and just pass the cmd->flags directly.
The cmd->flags member is an unsigned int, change the parameter type
in the the ns_to_timer() functions to match.
For aesthetics, rename the parameter in all the ns_to_timer()
functions to 'flags'.
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>
Diffstat (limited to 'drivers/staging/comedi/drivers/ni_at_a2150.c')
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_at_a2150.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/staging/comedi/drivers/ni_at_a2150.c b/drivers/staging/comedi/drivers/ni_at_a2150.c index c0ac8fd6ecab..0638c1ac8cbf 100644 --- a/drivers/staging/comedi/drivers/ni_at_a2150.c +++ b/drivers/staging/comedi/drivers/ni_at_a2150.c @@ -159,7 +159,7 @@ struct a2150_private { static int a2150_cancel(struct comedi_device *dev, struct comedi_subdevice *s); static int a2150_get_timing(struct comedi_device *dev, unsigned int *period, - int flags); + unsigned int flags); static int a2150_set_chanlist(struct comedi_device *dev, unsigned int start_channel, unsigned int num_channels); @@ -580,7 +580,7 @@ static int a2150_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, * period, adjusts requested period to actual timing. */ static int a2150_get_timing(struct comedi_device *dev, unsigned int *period, - int flags) + unsigned int flags) { const struct a2150_board *thisboard = comedi_board(dev); struct a2150_private *devpriv = dev->private; @@ -621,8 +621,7 @@ static int a2150_get_timing(struct comedi_device *dev, unsigned int *period, } } } - flags &= TRIG_ROUND_MASK; - switch (flags) { + switch (flags & TRIG_ROUND_MASK) { case TRIG_ROUND_NEAREST: default: /* if least upper bound is better approximation */ |