From: Bartosz Golaszewski <bgolaszewski@baylibre.com>
To: Linus Walleij <linus.walleij@linaro.org>,
Alexandre Courbot <gnurou@gmail.com>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Vignesh R <vigneshr@ti.com>, Yong Li <yong.b.li@intel.com>,
Geert Uytterhoeven <geert+renesas@glider.be>
Cc: linux-gpio <linux-gpio@vger.kernel.org>,
LKML <linux-kernel@vger.kernel.org>,
Bartosz Golaszewski <bgolaszewski@baylibre.com>
Subject: [PATCH v3 4/5] gpio: pca953x: remove an unused variable
Date: Wed, 7 Sep 2016 15:37:51 +0200 [thread overview]
Message-ID: <1473255472-16090-5-git-send-email-bgolaszewski@baylibre.com> (raw)
In-Reply-To: <1473255472-16090-1-git-send-email-bgolaszewski@baylibre.com>
The chip_type variable in struct pca953x_chip is no longer required.
Remove it.
Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
---
drivers/gpio/gpio-pca953x.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/drivers/gpio/gpio-pca953x.c b/drivers/gpio/gpio-pca953x.c
index 018bd18..b08ed52 100644
--- a/drivers/gpio/gpio-pca953x.c
+++ b/drivers/gpio/gpio-pca953x.c
@@ -129,7 +129,6 @@ struct pca953x_chip {
struct i2c_client *client;
struct gpio_chip gpio_chip;
const char *const *names;
- int chip_type;
unsigned long driver_data;
const struct pca953x_offset *offset;
@@ -771,8 +770,6 @@ static int pca953x_probe(struct i2c_client *client,
}
}
- chip->chip_type = PCA_CHIP_TYPE(chip->driver_data);
-
mutex_init(&chip->i2c_lock);
/* initialize cached registers from their original values.
@@ -787,13 +784,14 @@ static int pca953x_probe(struct i2c_client *client,
chip->write_regs = pca953x_write_regs_24;
chip->read_regs = pca953x_read_regs_24;
} else {
- chip->write_regs = chip->chip_type == PCA953X_TYPE ?
- pca953x_write_regs_16 :
- pca957x_write_regs_16;
+ if (PCA_CHIP_TYPE(chip->driver_data) == PCA953X_TYPE)
+ chip->write_regs = pca953x_write_regs_16;
+ else
+ chip->write_regs = pca957x_write_regs_16;
chip->read_regs = pca953x_read_regs_16;
}
- if (chip->chip_type == PCA953X_TYPE)
+ if (PCA_CHIP_TYPE(chip->driver_data) == PCA953X_TYPE)
ret = device_pca953x_init(chip, invert);
else
ret = device_pca957x_init(chip, invert);
--
2.7.4
next prev parent reply other threads:[~2016-09-07 13:37 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-07 13:37 [PATCH v3 0/5] gpio: pca953x: code refactoring Bartosz Golaszewski
2016-09-07 13:37 ` [PATCH v3 1/5] gpio: pca953x: code shrink Bartosz Golaszewski
2016-09-07 13:37 ` [PATCH v3 2/5] gpio: pca953x: refactor pca953x_write_regs() Bartosz Golaszewski
2016-09-07 13:37 ` [PATCH v3 3/5] gpio: pca953x: refactor pca953x_read_regs() Bartosz Golaszewski
2016-09-07 13:56 ` Andy Shevchenko
2016-09-07 14:51 ` Bartosz Golaszewski
2016-09-07 13:37 ` Bartosz Golaszewski [this message]
2016-09-07 13:58 ` [PATCH v3 4/5] gpio: pca953x: remove an unused variable Andy Shevchenko
2016-09-07 13:37 ` [PATCH v3 5/5] gpio: pca953x: coding style fixes Bartosz Golaszewski
2016-09-07 14:00 ` Andy Shevchenko
2016-09-07 14:00 ` [PATCH v3 0/5] gpio: pca953x: code refactoring 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=1473255472-16090-5-git-send-email-bgolaszewski@baylibre.com \
--to=bgolaszewski@baylibre.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=geert+renesas@glider.be \
--cc=gnurou@gmail.com \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=vigneshr@ti.com \
--cc=yong.b.li@intel.com \
/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;
as well as URLs for NNTP newsgroup(s).