Commit 6fdeb6cb authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Bartosz Golaszewski

gpio: pca953x: drop unused parameters of pca953x_recalc_addr()

After the previous patch the two last parameters of
pca953x_recalc_addr() are unused and so can be dropped.
Tested-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarBartosz Golaszewski <bgolaszewski@baylibre.com>
parent bcf41dc4
...@@ -326,8 +326,7 @@ static const struct regmap_config pca953x_ai_i2c_regmap = { ...@@ -326,8 +326,7 @@ static const struct regmap_config pca953x_ai_i2c_regmap = {
.max_register = 0x7f, .max_register = 0x7f,
}; };
static u8 pca953x_recalc_addr(struct pca953x_chip *chip, int reg, int off, static u8 pca953x_recalc_addr(struct pca953x_chip *chip, int reg, int off)
bool write, bool addrinc)
{ {
int bank_shift = pca953x_bank_shift(chip); int bank_shift = pca953x_bank_shift(chip);
int addr = (reg & PCAL_GPIO_MASK) << bank_shift; int addr = (reg & PCAL_GPIO_MASK) << bank_shift;
...@@ -339,7 +338,7 @@ static u8 pca953x_recalc_addr(struct pca953x_chip *chip, int reg, int off, ...@@ -339,7 +338,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) 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);
u8 value[MAX_BANK]; u8 value[MAX_BANK];
int i, ret; int i, ret;
...@@ -357,7 +356,7 @@ static int pca953x_write_regs(struct pca953x_chip *chip, int reg, unsigned long ...@@ -357,7 +356,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) 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]; u8 value[MAX_BANK];
int i, ret; int i, ret;
...@@ -376,8 +375,7 @@ static int pca953x_read_regs(struct pca953x_chip *chip, int reg, unsigned long * ...@@ -376,8 +375,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) static int pca953x_gpio_direction_input(struct gpio_chip *gc, unsigned off)
{ {
struct pca953x_chip *chip = gpiochip_get_data(gc); struct pca953x_chip *chip = gpiochip_get_data(gc);
u8 dirreg = pca953x_recalc_addr(chip, chip->regs->direction, off, u8 dirreg = pca953x_recalc_addr(chip, chip->regs->direction, off);
true, false);
u8 bit = BIT(off % BANK_SZ); u8 bit = BIT(off % BANK_SZ);
int ret; int ret;
...@@ -391,10 +389,8 @@ static int pca953x_gpio_direction_output(struct gpio_chip *gc, ...@@ -391,10 +389,8 @@ static int pca953x_gpio_direction_output(struct gpio_chip *gc,
unsigned off, int val) unsigned off, int val)
{ {
struct pca953x_chip *chip = gpiochip_get_data(gc); struct pca953x_chip *chip = gpiochip_get_data(gc);
u8 dirreg = pca953x_recalc_addr(chip, chip->regs->direction, off, u8 dirreg = pca953x_recalc_addr(chip, chip->regs->direction, off);
true, false); u8 outreg = pca953x_recalc_addr(chip, chip->regs->output, off);
u8 outreg = pca953x_recalc_addr(chip, chip->regs->output, off,
true, false);
u8 bit = BIT(off % BANK_SZ); u8 bit = BIT(off % BANK_SZ);
int ret; int ret;
...@@ -414,8 +410,7 @@ static int pca953x_gpio_direction_output(struct gpio_chip *gc, ...@@ -414,8 +410,7 @@ static int pca953x_gpio_direction_output(struct gpio_chip *gc,
static int pca953x_gpio_get_value(struct gpio_chip *gc, unsigned off) static int pca953x_gpio_get_value(struct gpio_chip *gc, unsigned off)
{ {
struct pca953x_chip *chip = gpiochip_get_data(gc); struct pca953x_chip *chip = gpiochip_get_data(gc);
u8 inreg = pca953x_recalc_addr(chip, chip->regs->input, off, u8 inreg = pca953x_recalc_addr(chip, chip->regs->input, off);
true, false);
u8 bit = BIT(off % BANK_SZ); u8 bit = BIT(off % BANK_SZ);
u32 reg_val; u32 reg_val;
int ret; int ret;
...@@ -439,8 +434,7 @@ static int pca953x_gpio_get_value(struct gpio_chip *gc, unsigned off) ...@@ -439,8 +434,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) static void pca953x_gpio_set_value(struct gpio_chip *gc, unsigned off, int val)
{ {
struct pca953x_chip *chip = gpiochip_get_data(gc); struct pca953x_chip *chip = gpiochip_get_data(gc);
u8 outreg = pca953x_recalc_addr(chip, chip->regs->output, off, u8 outreg = pca953x_recalc_addr(chip, chip->regs->output, off);
true, false);
u8 bit = BIT(off % BANK_SZ); u8 bit = BIT(off % BANK_SZ);
mutex_lock(&chip->i2c_lock); mutex_lock(&chip->i2c_lock);
...@@ -451,8 +445,7 @@ static void pca953x_gpio_set_value(struct gpio_chip *gc, unsigned off, int val) ...@@ -451,8 +445,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) static int pca953x_gpio_get_direction(struct gpio_chip *gc, unsigned off)
{ {
struct pca953x_chip *chip = gpiochip_get_data(gc); struct pca953x_chip *chip = gpiochip_get_data(gc);
u8 dirreg = pca953x_recalc_addr(chip, chip->regs->direction, off, u8 dirreg = pca953x_recalc_addr(chip, chip->regs->direction, off);
true, false);
u8 bit = BIT(off % BANK_SZ); u8 bit = BIT(off % BANK_SZ);
u32 reg_val; u32 reg_val;
int ret; int ret;
...@@ -509,10 +502,8 @@ static int pca953x_gpio_set_pull_up_down(struct pca953x_chip *chip, ...@@ -509,10 +502,8 @@ static int pca953x_gpio_set_pull_up_down(struct pca953x_chip *chip,
unsigned int offset, unsigned int offset,
unsigned long config) unsigned long config)
{ {
u8 pull_en_reg = pca953x_recalc_addr(chip, PCAL953X_PULL_EN, offset, 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);
u8 pull_sel_reg = pca953x_recalc_addr(chip, PCAL953X_PULL_SEL, offset,
true, false);
u8 bit = BIT(offset % BANK_SZ); u8 bit = BIT(offset % BANK_SZ);
int ret; int ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment