sh-pfc: Rename struct sh_pfc nr_pins field to nr_gpio_pins

The field contains the number of pins with an associated GPIO port. This
is currently equal to the total number of pins but will be modified when
adding support for pins without a GPIO port. Rename the field
accordingly.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Tested-by: Yusuke Goda <yusuke.goda.sx@renesas.com>

diff --git a/drivers/pinctrl/sh-pfc/core.h b/drivers/pinctrl/sh-pfc/core.h
index f02ba1dde3a0738d4dd67b5c80c0b9e99537edba..93963a19b340a91effe858190a53a02c0c2d22da 100644 (file)
--- a/drivers/pinctrl/sh-pfc/core.h
+++ b/drivers/pinctrl/sh-pfc/core.h
@@ -34,7 +34,7 @@ struct sh_pfc {
        unsigned int num_windows;
        struct sh_pfc_window *window;
 
-       unsigned int nr_pins;
+       unsigned int nr_gpio_pins;
 
        struct sh_pfc_chip *gpio;
        struct sh_pfc_chip *func;

diff --git a/drivers/pinctrl/sh-pfc/gpio.c b/drivers/pinctrl/sh-pfc/gpio.c
index 87ae38b97a3842a7d9aecbd9ecf958282b9aa424..7661be5054a00938fbcedc21a318184e484e2828 100644 (file)
--- a/drivers/pinctrl/sh-pfc/gpio.c
+++ b/drivers/pinctrl/sh-pfc/gpio.c
@@ -245,7 +245,7 @@ static int gpio_pin_setup(struct sh_pfc_chip *chip)
        gc->dev = pfc->dev;
        gc->owner = THIS_MODULE;
        gc->base = 0;
-       gc->ngpio = pfc->nr_pins;
+       gc->ngpio = pfc->nr_gpio_pins;
 
        return 0;
 }
@@ -293,7 +293,7 @@ static int gpio_function_setup(struct sh_pfc_chip *chip)
 
        gc->label = pfc->info->name;
        gc->owner = THIS_MODULE;
-       gc->base = pfc->nr_pins;
+       gc->base = pfc->nr_gpio_pins;
        gc->ngpio = pfc->info->nr_func_gpios;
 
        return 0;

diff --git a/drivers/pinctrl/sh-pfc/pinctrl.c b/drivers/pinctrl/sh-pfc/pinctrl.c
index bc8b028bb5d21eab5ce24a9bc19f83ec36309e0d..314255d79bff820b20031a4f32b32ab31f532880 100644 (file)
--- a/drivers/pinctrl/sh-pfc/pinctrl.c
+++ b/drivers/pinctrl/sh-pfc/pinctrl.c
@@ -632,7 +632,7 @@ static int sh_pfc_map_pins(struct sh_pfc *pfc, struct sh_pfc_pinctrl *pmx)
                }
        }
 
-       pfc->nr_pins = ranges[nr_ranges-1].end + 1;
+       pfc->nr_gpio_pins = ranges[nr_ranges-1].end + 1;
 
        return nr_ranges;
 }