From: "H. Nikolaus Schaller" <hns@goldelico.com>
To: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
Cc: Marek Vasut <marek.vasut@gmail.com>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Mark Brown <broonie@kernel.org>,
kernel@pengutronix.de,
"open list:GPIO SUBSYSTEM" <linux-gpio@vger.kernel.org>,
Discussions about the Letux Kernel
<letux-kernel@openphoenux.org>
Subject: Re: [PATCH v1 2/2] [RFC] gpio: pca953x: drop unused parameters of pca953x_recalc_addr()
Date: Fri, 27 Mar 2020 23:06:43 +0100 [thread overview]
Message-ID: <DF902AF8-CA86-4F31-9D98-288D40634D69@goldelico.com> (raw)
In-Reply-To: <20200327172244.30816-3-u.kleine-koenig@pengutronix.de>
> Am 27.03.2020 um 18:22 schrieb Uwe Kleine-König <u.kleine-koenig@pengutronix.de>:
>
> After the previous patch the two last parameters of
> pca953x_recalc_addr() are unused and so can be dropped.
>
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> ---
> drivers/gpio/gpio-pca953x.c | 31 +++++++++++--------------------
> 1 file changed, 11 insertions(+), 20 deletions(-)
>
> diff --git a/drivers/gpio/gpio-pca953x.c b/drivers/gpio/gpio-pca953x.c
> index 8168558299c2..f4943cad5d0e 100644
> --- a/drivers/gpio/gpio-pca953x.c
> +++ b/drivers/gpio/gpio-pca953x.c
> @@ -325,8 +325,7 @@ static const struct regmap_config pca953x_ai_i2c_regmap = {
> .max_register = 0x7f,
> };
>
> -static u8 pca953x_recalc_addr(struct pca953x_chip *chip, int reg, int off,
> - bool write, bool addrinc)
> +static u8 pca953x_recalc_addr(struct pca953x_chip *chip, int reg, int off)
> {
> int bank_shift = pca953x_bank_shift(chip);
> int addr = (reg & PCAL_GPIO_MASK) << bank_shift;
> @@ -338,7 +337,7 @@ static u8 pca953x_recalc_addr(struct pca953x_chip *chip, int reg, int off,
>
> static int pca953x_write_regs(struct pca953x_chip *chip, int reg, unsigned long *val)
> {
> - u8 regaddr = pca953x_recalc_addr(chip, reg, 0, true, true);
> + u8 regaddr = pca953x_recalc_addr(chip, reg, 0;
here is some ")" missing.
After fix&compile it still works for the pcal6524 of the OMAP5/Pyra (LPAE build).
> u8 value[MAX_BANK];
> int i, ret;
>
> @@ -356,7 +355,7 @@ static int pca953x_write_regs(struct pca953x_chip *chip, int reg, unsigned long
>
> static int pca953x_read_regs(struct pca953x_chip *chip, int reg, unsigned long *val)
> {
> - u8 regaddr = pca953x_recalc_addr(chip, reg, 0, false, true);
> + u8 regaddr = pca953x_recalc_addr(chip, reg, 0);
> u8 value[MAX_BANK];
> int i, ret;
>
> @@ -375,8 +374,7 @@ static int pca953x_read_regs(struct pca953x_chip *chip, int reg, unsigned long *
> static int pca953x_gpio_direction_input(struct gpio_chip *gc, unsigned off)
> {
> struct pca953x_chip *chip = gpiochip_get_data(gc);
> - u8 dirreg = pca953x_recalc_addr(chip, chip->regs->direction, off,
> - true, false);
> + u8 dirreg = pca953x_recalc_addr(chip, chip->regs->direction, off);
> u8 bit = BIT(off % BANK_SZ);
> int ret;
>
> @@ -390,10 +388,8 @@ static int pca953x_gpio_direction_output(struct gpio_chip *gc,
> unsigned off, int val)
> {
> struct pca953x_chip *chip = gpiochip_get_data(gc);
> - u8 dirreg = pca953x_recalc_addr(chip, chip->regs->direction, off,
> - true, false);
> - u8 outreg = pca953x_recalc_addr(chip, chip->regs->output, off,
> - true, false);
> + u8 dirreg = pca953x_recalc_addr(chip, chip->regs->direction, off);
> + u8 outreg = pca953x_recalc_addr(chip, chip->regs->output, off);
> u8 bit = BIT(off % BANK_SZ);
> int ret;
>
> @@ -413,8 +409,7 @@ static int pca953x_gpio_direction_output(struct gpio_chip *gc,
> static int pca953x_gpio_get_value(struct gpio_chip *gc, unsigned off)
> {
> struct pca953x_chip *chip = gpiochip_get_data(gc);
> - u8 inreg = pca953x_recalc_addr(chip, chip->regs->input, off,
> - true, false);
> + u8 inreg = pca953x_recalc_addr(chip, chip->regs->input, off);
> u8 bit = BIT(off % BANK_SZ);
> u32 reg_val;
> int ret;
> @@ -438,8 +433,7 @@ static int pca953x_gpio_get_value(struct gpio_chip *gc, unsigned off)
> static void pca953x_gpio_set_value(struct gpio_chip *gc, unsigned off, int val)
> {
> struct pca953x_chip *chip = gpiochip_get_data(gc);
> - u8 outreg = pca953x_recalc_addr(chip, chip->regs->output, off,
> - true, false);
> + u8 outreg = pca953x_recalc_addr(chip, chip->regs->output, off);
> u8 bit = BIT(off % BANK_SZ);
>
> mutex_lock(&chip->i2c_lock);
> @@ -450,8 +444,7 @@ static void pca953x_gpio_set_value(struct gpio_chip *gc, unsigned off, int val)
> static int pca953x_gpio_get_direction(struct gpio_chip *gc, unsigned off)
> {
> struct pca953x_chip *chip = gpiochip_get_data(gc);
> - u8 dirreg = pca953x_recalc_addr(chip, chip->regs->direction, off,
> - true, false);
> + u8 dirreg = pca953x_recalc_addr(chip, chip->regs->direction, off);
> u8 bit = BIT(off % BANK_SZ);
> u32 reg_val;
> int ret;
> @@ -491,10 +484,8 @@ static int pca953x_gpio_set_pull_up_down(struct pca953x_chip *chip,
> unsigned int offset,
> unsigned long config)
> {
> - u8 pull_en_reg = pca953x_recalc_addr(chip, PCAL953X_PULL_EN, offset,
> - true, false);
> - u8 pull_sel_reg = pca953x_recalc_addr(chip, PCAL953X_PULL_SEL, offset,
> - true, false);
> + u8 pull_en_reg = pca953x_recalc_addr(chip, PCAL953X_PULL_EN, offset);
> + u8 pull_sel_reg = pca953x_recalc_addr(chip, PCAL953X_PULL_SEL, offset);
> u8 bit = BIT(offset % BANK_SZ);
> int ret;
>
> --
> 2.26.0.rc2
>
BR and thanks,
Nikolaus Schaller
next prev parent reply other threads:[~2020-03-27 22:07 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-27 7:49 register access issues in pca953x gpio driver Uwe Kleine-König
2020-03-27 10:26 ` Andy Shevchenko
2020-03-27 13:49 ` Uwe Kleine-König
2020-03-27 13:03 ` Mark Brown
2020-03-27 13:46 ` Uwe Kleine-König
2020-03-27 13:58 ` Mark Brown
2020-03-27 17:22 ` [PATCH v1 0/2] gpio: pca953x: fix handling of automatic address incrementing Uwe Kleine-König
2020-03-27 17:22 ` [PATCH v1 1/2] [RFC] " Uwe Kleine-König
2020-03-27 17:22 ` [PATCH v1 2/2] [RFC] gpio: pca953x: drop unused parameters of pca953x_recalc_addr() Uwe Kleine-König
2020-03-27 22:06 ` H. Nikolaus Schaller [this message]
2020-03-28 9:27 ` Uwe Kleine-König
2020-03-28 19:41 ` Andy Shevchenko
2020-03-30 14:07 ` 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=DF902AF8-CA86-4F31-9D98-288D40634D69@goldelico.com \
--to=hns@goldelico.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=broonie@kernel.org \
--cc=kernel@pengutronix.de \
--cc=letux-kernel@openphoenux.org \
--cc=linux-gpio@vger.kernel.org \
--cc=marek.vasut@gmail.com \
--cc=u.kleine-koenig@pengutronix.de \
/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).