From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>,
linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Linus Walleij <linus.walleij@linaro.org>,
Bartosz Golaszewski <brgl@bgdev.pl>,
Haibo Chen <haibo.chen@nxp.com>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: [PATCH v2 2/4] gpio: pca953x: avoid logically dead code
Date: Sun, 11 Dec 2022 00:05:59 +0200 [thread overview]
Message-ID: <20221210220601.77648-2-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20221210220601.77648-1-andriy.shevchenko@linux.intel.com>
From: Haibo Chen <haibo.chen@nxp.com>
The current code logic make the condition "else if (reg >= 0x54)"
can't be true, cause the dead code. So fix it to match the coder
expectation. This is reported by Coverity.
Fixes: 13c5d4ce8060 ("gpio: pca953x: Add support for PCAL6534")
Signed-off-by: Haibo Chen <haibo.chen@nxp.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
v2: shuffled code to check bigger value first (Andy)
drivers/gpio/gpio-pca953x.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/gpio/gpio-pca953x.c b/drivers/gpio/gpio-pca953x.c
index 5299e5bb76d6..2c8586b3191f 100644
--- a/drivers/gpio/gpio-pca953x.c
+++ b/drivers/gpio/gpio-pca953x.c
@@ -309,26 +309,26 @@ static bool pcal6534_check_register(struct pca953x_chip *chip, unsigned int reg,
int bank;
int offset;
- if (reg >= 0x30) {
+ if (reg >= 0x54) {
/*
- * Reserved block between 14h and 2Fh does not align on
- * expected bank boundaries like other devices.
+ * Handle lack of reserved registers after output port
+ * configuration register to form a bank.
*/
- int temp = reg - 0x30;
+ int temp = reg - 0x54;
bank = temp / NBANK(chip);
offset = temp - (bank * NBANK(chip));
- bank += 8;
- } else if (reg >= 0x54) {
+ bank += 16;
+ } else if (reg >= 0x30) {
/*
- * Handle lack of reserved registers after output port
- * configuration register to form a bank.
+ * Reserved block between 14h and 2Fh does not align on
+ * expected bank boundaries like other devices.
*/
- int temp = reg - 0x54;
+ int temp = reg - 0x30;
bank = temp / NBANK(chip);
offset = temp - (bank * NBANK(chip));
- bank += 16;
+ bank += 8;
} else {
bank = reg / NBANK(chip);
offset = reg - (bank * NBANK(chip));
--
2.35.1
next prev parent reply other threads:[~2022-12-10 22:05 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-10 22:05 [PATCH v2 1/4] gpio: pca953x: avoid to use uninitialized value pinctrl Andy Shevchenko
2022-12-10 22:05 ` Andy Shevchenko [this message]
2022-12-10 22:06 ` [PATCH v2 3/4] gpio: pca953x: Clean up pcal6534_check_register() Andy Shevchenko
2022-12-10 22:06 ` [PATCH v2 4/4] gpio: pca953x: Remove unused PCAL953X_OUT_CONF from pcal6534_recalc_addr() Andy Shevchenko
2022-12-30 12:04 ` [PATCH v2 1/4] gpio: pca953x: avoid to use uninitialized value pinctrl Andy Shevchenko
2022-12-30 12:48 ` Bartosz Golaszewski
2022-12-30 21:36 ` Andy Shevchenko
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=20221210220601.77648-2-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=bartosz.golaszewski@linaro.org \
--cc=brgl@bgdev.pl \
--cc=haibo.chen@nxp.com \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.