[PATCH] drivers/staging/comedi/drivers/ni_atmio16d.c: remove pointless condition

Dan Carpenter dan.carpenter at oracle.com
Fri Jul 11 13:11:04 UTC 2014


On Fri, Jul 11, 2014 at 03:30:15PM +0300, Andrey Utkin wrote:
> 2014-07-11 15:01 GMT+03:00 Ian Abbott <abbotti at mev.co.uk>:
> > On 2014-07-11 11:13, Andrey Utkin wrote:
> >>
> >> The issue was discovered with static analysis and has two instances in
> >> this file. The code looks like this
> >> if (x < 65536000) {
> >>         ...
> >> } else if (x < 655360000) {
> >>         ...
> >> } else if (x <= 0xffffffff /* 6553600000 */) {
> >>         ...
> >> } else if (x <= 0xffffffff /* 65536000000 */) {
> >>         ...
> >> }
> >>
> >> The meaning of this block is to select appropriate clock frequency for
> >> interval timer basing on "x", which is amount of time.
> >>
> >> Notes:
> >> 1. That last condition matches previous one - that's the issue.
> >> 2. Decimal numbers in comments don't match hex numbers in expressions.
> >> But in first case the numbers have same order, while in the second case
> >> the hex number is the same, and the decimal one is 10 times bigger.
> >> 3. Actually type of "x" is "unsigned int", so its exact upper limit is
> >> not obviously known.
> >> 4. There's no "else" block.
> >>
> >> So it makes sense to make an "else" block from last "else if" case. The
> >> code inside the block seems correct for such usage.
> >>
> >> Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=79871
> >> Reported-by: David Binderman <dcb314 at hotmail.com>
> >> Signed-off-by: Andrey Utkin <andrey.krieger.utkin at gmail.com>
> >> ---
> >>   drivers/staging/comedi/drivers/ni_atmio16d.c | 4 ++--
> >>   1 file changed, 2 insertions(+), 2 deletions(-)
> >>
> >> diff --git a/drivers/staging/comedi/drivers/ni_atmio16d.c
> >> b/drivers/staging/comedi/drivers/ni_atmio16d.c
> >> index 6ad27f5..895b56d 100644
> >> --- a/drivers/staging/comedi/drivers/ni_atmio16d.c
> >> +++ b/drivers/staging/comedi/drivers/ni_atmio16d.c
> >> @@ -338,7 +338,7 @@ static int atmio16d_ai_cmd(struct comedi_device *dev,
> >>         } else if (cmd->convert_arg <= 0xffffffff /* 6553600000 */) {
> >>                 base_clock = CLOCK_10_KHZ;
> >>                 timer = cmd->convert_arg / 100000;
> >> -       } else if (cmd->convert_arg <= 0xffffffff /* 65536000000 */) {
> >> +       } else {
> >>                 base_clock = CLOCK_1_KHZ;
> >>                 timer = cmd->convert_arg / 1000000;
> >>         }
> >
> >
> > Since 0xffffffff is the maximum value 'cmd->convert_arg' can be,
> 
> Could you please substantiate this? I see that convert_arg has type
> "unsigned int" which may be 8 bytes on 64-bit platform.

No.  On linux unsigned int is always 32 bits.

regards,
dan carpenter




More information about the devel mailing list