| From 564b6f12caff523266575f11ffbab8c6a57b239e Mon Sep 17 00:00:00 2001 |
| From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Date: Mon, 15 Jul 2013 13:25:08 +0200 |
| Subject: sh-pfc: Rename gpio arguments to be consistent with the rest of the |
| code |
| |
| The gpio_get_data_reg() and gpio_setup_data_reg() functions both take an |
| argument named gpio. The argument contains a GPIO offset for the first |
| function and a pin index for the second one. Rename them to offset and |
| idx respectively to match the rest of the code. |
| |
| Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Tested-by: Yusuke Goda <yusuke.goda.sx@renesas.com> |
| (cherry picked from commit 757b055a65c5e0f84185012ef45cc2e15a337b63) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/pinctrl/sh-pfc/gpio.c | 10 +++++----- |
| 1 file changed, 5 insertions(+), 5 deletions(-) |
| |
| diff --git a/drivers/pinctrl/sh-pfc/gpio.c b/drivers/pinctrl/sh-pfc/gpio.c |
| index 3620bd84..87ae38b9 100644 |
| --- a/drivers/pinctrl/sh-pfc/gpio.c |
| +++ b/drivers/pinctrl/sh-pfc/gpio.c |
| @@ -48,11 +48,11 @@ static struct sh_pfc *gpio_to_pfc(struct gpio_chip *gc) |
| return gpio_to_pfc_chip(gc)->pfc; |
| } |
| |
| -static void gpio_get_data_reg(struct sh_pfc_chip *chip, unsigned int gpio, |
| +static void gpio_get_data_reg(struct sh_pfc_chip *chip, unsigned int offset, |
| struct sh_pfc_gpio_data_reg **reg, |
| unsigned int *bit) |
| { |
| - int idx = sh_pfc_get_pin_index(chip->pfc, gpio); |
| + int idx = sh_pfc_get_pin_index(chip->pfc, offset); |
| struct sh_pfc_gpio_pin *gpio_pin = &chip->pins[idx]; |
| |
| *reg = &chip->regs[gpio_pin->dreg]; |
| @@ -76,11 +76,11 @@ static void gpio_write_data_reg(struct sh_pfc_chip *chip, |
| sh_pfc_write_raw_reg(mem, dreg->reg_width, value); |
| } |
| |
| -static void gpio_setup_data_reg(struct sh_pfc_chip *chip, unsigned gpio) |
| +static void gpio_setup_data_reg(struct sh_pfc_chip *chip, unsigned idx) |
| { |
| struct sh_pfc *pfc = chip->pfc; |
| - struct sh_pfc_gpio_pin *gpio_pin = &chip->pins[gpio]; |
| - const struct sh_pfc_pin *pin = &pfc->info->pins[gpio]; |
| + struct sh_pfc_gpio_pin *gpio_pin = &chip->pins[idx]; |
| + const struct sh_pfc_pin *pin = &pfc->info->pins[idx]; |
| const struct pinmux_data_reg *dreg; |
| unsigned int bit; |
| unsigned int i; |
| -- |
| 1.8.4.3.gca3854a |
| |
