public inbox for kernel-janitors@vger.kernel.org
 help / color / mirror / Atom feed
From: Andrey Utkin <andrey.krieger.utkin@gmail.com>
To: linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org,
	devel@driverdev.osuosl.org
Cc: gregkh@linuxfoundation.org, hsweeten@visionengravers.com,
	abbotti@mev.co.uk, dcb314@hotmail.com,
	Andrey Utkin <andrey.krieger.utkin@gmail.com>
Subject: [PATCH] drivers/staging/comedi/drivers/ni_atmio16d.c: remove pointless condition
Date: Fri, 11 Jul 2014 10:13:23 +0000	[thread overview]
Message-ID: <1405073603-21468-1-git-send-email-andrey.krieger.utkin@gmail.com> (raw)
In-Reply-To: <1316068759-3460-1-git-send-email-cpeterso@cpeterso.com>

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?idy871
Reported-by: David Binderman <dcb314@hotmail.com>
Signed-off-by: Andrey Utkin <andrey.krieger.utkin@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;
 	}
@@ -406,7 +406,7 @@ static int atmio16d_ai_cmd(struct comedi_device *dev,
 		} else if (cmd->scan_begin_arg < 0xffffffff /* 6553600000 */) {
 			base_clock = CLOCK_10_KHZ;
 			timer = cmd->scan_begin_arg / 100000;
-		} else if (cmd->scan_begin_arg < 0xffffffff /* 65536000000 */) {
+		} else {
 			base_clock = CLOCK_1_KHZ;
 			timer = cmd->scan_begin_arg / 1000000;
 		}
-- 
1.8.3.2


  reply	other threads:[~2014-07-11 10:13 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-09-15  6:39 [PATCH] drivers/staging/comedi/drivers/ni_stc.h: rename prototype parameter from 'register' to 'reg' Chris Peterson
2014-07-11 10:13 ` Andrey Utkin [this message]
2014-07-11 12:01   ` [PATCH] drivers/staging/comedi/drivers/ni_atmio16d.c: remove pointless condition Ian Abbott
2014-07-11 12:30     ` Andrey Utkin
2014-07-11 12:43       ` Bernd Petrovitsch
2014-07-11 13:11       ` Dan Carpenter
2014-07-11 14:32   ` [PATCH v2] From: Andrey Utkin <andrey.krieger.utkin@gmail.com> Ian Abbott
2014-07-11 14:35     ` Ian Abbott
2014-07-11 14:38     ` [PATCH v3] drivers/staging/comedi/drivers/ni_atmio16d.c: remove pointless condition Ian Abbott
2014-07-11 14:39       ` Ian Abbott
2014-07-12  0:39         ` Greg KH
2014-07-11 15:34       ` Dan Carpenter
2014-07-11 17:06         ` Ian Abbott
2014-07-11 17:22           ` Dan Carpenter
2014-07-11 17:54       ` Andrey Utkin
2014-07-11 19:40         ` Dan Carpenter

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1405073603-21468-1-git-send-email-andrey.krieger.utkin@gmail.com \
    --to=andrey.krieger.utkin@gmail.com \
    --cc=abbotti@mev.co.uk \
    --cc=dcb314@hotmail.com \
    --cc=devel@driverdev.osuosl.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=hsweeten@visionengravers.com \
    --cc=kernel-janitors@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox