Skip to content

Commit 315c441

Browse files
author
Bartosz Golaszewski
committed
pinctrl: change the signature of pinctrl_gpio_direction()
Modify pinctrl_gpio_direction() to be in line with public GPIO helpers and take a pair of GPIO chip & offset as arguments. Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Acked-by: Linus Walleij <linus.walleij@linaro.org>
1 parent acf2981 commit 315c441

1 file changed

Lines changed: 7 additions & 5 deletions

File tree

drivers/pinctrl/core.c

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -850,22 +850,24 @@ void pinctrl_gpio_free(struct gpio_chip *gc, unsigned int offset)
850850
}
851851
EXPORT_SYMBOL_GPL(pinctrl_gpio_free);
852852

853-
static int pinctrl_gpio_direction(unsigned gpio, bool input)
853+
static int pinctrl_gpio_direction(struct gpio_chip *gc, unsigned int offset,
854+
bool input)
854855
{
855856
struct pinctrl_dev *pctldev;
856857
struct pinctrl_gpio_range *range;
857858
int ret;
858859
int pin;
859860

860-
ret = pinctrl_get_device_gpio_range(gpio, &pctldev, &range);
861+
ret = pinctrl_get_device_gpio_range(gc->base + offset, &pctldev,
862+
&range);
861863
if (ret) {
862864
return ret;
863865
}
864866

865867
mutex_lock(&pctldev->mutex);
866868

867869
/* Convert to the pin controllers number space */
868-
pin = gpio_to_pin(range, gpio);
870+
pin = gpio_to_pin(range, gc->base + offset);
869871
ret = pinmux_gpio_direction(pctldev, range, pin, input);
870872

871873
mutex_unlock(&pctldev->mutex);
@@ -884,7 +886,7 @@ static int pinctrl_gpio_direction(unsigned gpio, bool input)
884886
*/
885887
int pinctrl_gpio_direction_input(struct gpio_chip *gc, unsigned int offset)
886888
{
887-
return pinctrl_gpio_direction(gc->base + offset, true);
889+
return pinctrl_gpio_direction(gc, offset, true);
888890
}
889891
EXPORT_SYMBOL_GPL(pinctrl_gpio_direction_input);
890892

@@ -899,7 +901,7 @@ EXPORT_SYMBOL_GPL(pinctrl_gpio_direction_input);
899901
*/
900902
int pinctrl_gpio_direction_output(struct gpio_chip *gc, unsigned int offset)
901903
{
902-
return pinctrl_gpio_direction(gc->base + offset, false);
904+
return pinctrl_gpio_direction(gc, offset, false);
903905
}
904906
EXPORT_SYMBOL_GPL(pinctrl_gpio_direction_output);
905907

0 commit comments

Comments
 (0)