[PATCH 1/2] pinctrl: armada-37xx: rename reg-offset function

From: alpawi
Date: Tue Jun 18 2019 - 12:06:30 EST


From: Patrick Williams <alpawi@xxxxxxxxxx>

The previously named function 'armada_37xx_update_reg'
implies that it updates the hardware register, but it
only calculates a register offset. Rename to match
functionality.

Signed-off-by: Patrick Williams <alpawi@xxxxxxxxxx>
---
drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
index 6462d3ca7ceb..00598b6f5c2a 100644
--- a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
+++ b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
@@ -220,8 +220,8 @@ static const struct armada_37xx_pin_data armada_37xx_pin_sb = {
.ngroups = ARRAY_SIZE(armada_37xx_sb_groups),
};

-static inline void armada_37xx_update_reg(unsigned int *reg,
- unsigned int offset)
+static inline void armada_37xx_calc_reg_offset(unsigned int *reg,
+ unsigned int offset)
{
/* We never have more than 2 registers */
if (offset >= GPIO_PER_REG) {
@@ -376,7 +376,7 @@ static inline void armada_37xx_irq_update_reg(unsigned int *reg,
{
int offset = irqd_to_hwirq(d);

- armada_37xx_update_reg(reg, offset);
+ armada_37xx_calc_reg_offset(reg, offset);
}

static int armada_37xx_gpio_direction_input(struct gpio_chip *chip,
@@ -386,7 +386,7 @@ static int armada_37xx_gpio_direction_input(struct gpio_chip *chip,
unsigned int reg = OUTPUT_EN;
unsigned int mask;

- armada_37xx_update_reg(&reg, offset);
+ armada_37xx_calc_reg_offset(&reg, offset);
mask = BIT(offset);

return regmap_update_bits(info->regmap, reg, mask, 0);
@@ -399,7 +399,7 @@ static int armada_37xx_gpio_get_direction(struct gpio_chip *chip,
unsigned int reg = OUTPUT_EN;
unsigned int val, mask;

- armada_37xx_update_reg(&reg, offset);
+ armada_37xx_calc_reg_offset(&reg, offset);
mask = BIT(offset);
regmap_read(info->regmap, reg, &val);

@@ -413,7 +413,7 @@ static int armada_37xx_gpio_direction_output(struct gpio_chip *chip,
unsigned int reg = OUTPUT_EN;
unsigned int mask, val, ret;

- armada_37xx_update_reg(&reg, offset);
+ armada_37xx_calc_reg_offset(&reg, offset);
mask = BIT(offset);

ret = regmap_update_bits(info->regmap, reg, mask, mask);
@@ -434,7 +434,7 @@ static int armada_37xx_gpio_get(struct gpio_chip *chip, unsigned int offset)
unsigned int reg = INPUT_VAL;
unsigned int val, mask;

- armada_37xx_update_reg(&reg, offset);
+ armada_37xx_calc_reg_offset(&reg, offset);
mask = BIT(offset);

regmap_read(info->regmap, reg, &val);
@@ -449,7 +449,7 @@ static void armada_37xx_gpio_set(struct gpio_chip *chip, unsigned int offset,
unsigned int reg = OUTPUT_VAL;
unsigned int mask, val;

- armada_37xx_update_reg(&reg, offset);
+ armada_37xx_calc_reg_offset(&reg, offset);
mask = BIT(offset);
val = value ? mask : 0;

--
2.17.2 (Apple Git-113)