Merge tag 'platform-drivers-x86-v6.8-3' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-block.git] / drivers / pinctrl / pinmux.c

diff --git a/drivers/pinctrl/pinmux.c b/drivers/pinctrl/pinmux.c
index 23d2da0b99b928eaa93b9db9433c452ec754f6aa..abbb044d6acec66b299fea281c38cfb9f3480818 100644 (file)
--- a/drivers/pinctrl/pinmux.c
+++ b/drivers/pinctrl/pinmux.c
@@ -35,8 +35,8 @@
 int pinmux_check_ops(struct pinctrl_dev *pctldev)
 {
        const struct pinmux_ops *ops = pctldev->desc->pmxops;
-       unsigned nfuncs;
-       unsigned selector = 0;
+       unsigned int nfuncs;
+       unsigned int selector = 0;
 
        /* Check that we implement required operations */
        if (!ops ||
@@ -84,7 +84,7 @@ int pinmux_validate_map(const struct pinctrl_map *map, int i)
  * Controllers not defined as strict will always return true,
  * menaning that the gpio can be used.
  */
-bool pinmux_can_be_used_for_gpio(struct pinctrl_dev *pctldev, unsigned pin)
+bool pinmux_can_be_used_for_gpio(struct pinctrl_dev *pctldev, unsigned int pin)
 {
        struct pin_desc *desc = pin_desc_get(pctldev, pin);
        const struct pinmux_ops *ops = pctldev->desc->pmxops;
@@ -262,7 +262,7 @@ static const char *pin_free(struct pinctrl_dev *pctldev, int pin,
  */
 int pinmux_request_gpio(struct pinctrl_dev *pctldev,
                        struct pinctrl_gpio_range *range,
-                       unsigned pin, unsigned gpio)
+                       unsigned int pin, unsigned int gpio)
 {
        const char *owner;
        int ret;
@@ -285,7 +285,7 @@ int pinmux_request_gpio(struct pinctrl_dev *pctldev,
  * @pin: the affected currently GPIO-muxed in pin
  * @range: applicable GPIO range
  */
-void pinmux_free_gpio(struct pinctrl_dev *pctldev, unsigned pin,
+void pinmux_free_gpio(struct pinctrl_dev *pctldev, unsigned int pin,
                      struct pinctrl_gpio_range *range)
 {
        const char *owner;
@@ -303,7 +303,7 @@ void pinmux_free_gpio(struct pinctrl_dev *pctldev, unsigned pin,
  */
 int pinmux_gpio_direction(struct pinctrl_dev *pctldev,
                          struct pinctrl_gpio_range *range,
-                         unsigned pin, bool input)
+                         unsigned int pin, bool input)
 {
        const struct pinmux_ops *ops;
        int ret;
@@ -322,8 +322,8 @@ static int pinmux_func_name_to_selector(struct pinctrl_dev *pctldev,
                                        const char *function)
 {
        const struct pinmux_ops *ops = pctldev->desc->pmxops;
-       unsigned nfuncs = ops->get_functions_count(pctldev);
-       unsigned selector = 0;
+       unsigned int nfuncs = ops->get_functions_count(pctldev);
+       unsigned int selector = 0;
 
        /* See if this pctldev has this function */
        while (selector < nfuncs) {
@@ -344,7 +344,7 @@ int pinmux_map_to_setting(const struct pinctrl_map *map,
        struct pinctrl_dev *pctldev = setting->pctldev;
        const struct pinmux_ops *pmxops = pctldev->desc->pmxops;
        char const * const *groups;
-       unsigned num_groups;
+       unsigned int num_groups;
        int ret;
        const char *group;
 
@@ -409,8 +409,8 @@ int pinmux_enable_setting(const struct pinctrl_setting *setting)
        const struct pinctrl_ops *pctlops = pctldev->desc->pctlops;
        const struct pinmux_ops *ops = pctldev->desc->pmxops;
        int ret = 0;
-       const unsigned *pins = NULL;
-       unsigned num_pins = 0;
+       const unsigned int *pins = NULL;
+       unsigned int num_pins = 0;
        int i;
        struct pin_desc *desc;
 
@@ -489,8 +489,8 @@ void pinmux_disable_setting(const struct pinctrl_setting *setting)
        struct pinctrl_dev *pctldev = setting->pctldev;
        const struct pinctrl_ops *pctlops = pctldev->desc->pctlops;
        int ret = 0;
-       const unsigned *pins = NULL;
-       unsigned num_pins = 0;
+       const unsigned int *pins = NULL;
+       unsigned int num_pins = 0;
        int i;
        struct pin_desc *desc;
 
@@ -541,8 +541,8 @@ static int pinmux_functions_show(struct seq_file *s, void *what)
 {
        struct pinctrl_dev *pctldev = s->private;
        const struct pinmux_ops *pmxops = pctldev->desc->pmxops;
-       unsigned nfuncs;
-       unsigned func_selector = 0;
+       unsigned int nfuncs;
+       unsigned int func_selector = 0;
 
        if (!pmxops)
                return 0;
@@ -553,7 +553,7 @@ static int pinmux_functions_show(struct seq_file *s, void *what)
                const char *func = pmxops->get_function_name(pctldev,
                                                          func_selector);
                const char * const *groups;
-               unsigned num_groups;
+               unsigned int num_groups;
                int ret;
                int i;
 
@@ -584,7 +584,7 @@ static int pinmux_pins_show(struct seq_file *s, void *what)
        struct pinctrl_dev *pctldev = s->private;
        const struct pinctrl_ops *pctlops = pctldev->desc->pctlops;
        const struct pinmux_ops *pmxops = pctldev->desc->pmxops;
-       unsigned i, pin;
+       unsigned int i, pin;
 
        if (!pmxops)
                return 0;
@@ -818,7 +818,7 @@ EXPORT_SYMBOL_GPL(pinmux_generic_get_function_name);
 int pinmux_generic_get_function_groups(struct pinctrl_dev *pctldev,
                                       unsigned int selector,
                                       const char * const **groups,
-                                      unsigned * const num_groups)
+                                      unsigned int * const num_groups)
 {
        struct function_desc *function;