Commit 31d4e8d1 authored by Bartosz Golaszewski's avatar Bartosz Golaszewski
Browse files

pinctrl: change the signature of gpio_to_pin() 



Modify gpio_to_pin() to be in line with public GPIO helpers and take
a pair of GPIO chip & offset as arguments.

Signed-off-by: default avatarBartosz Golaszewski <bartosz.golaszewski@linaro.org>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 58e772f4

drivers/pinctrl/core.c

+11 −10
Original line number Diff line number Diff line
@@ -269,7 +269,8 @@ static int pinctrl_register_pins(struct pinctrl_dev *pctldev, 
/**

 * gpio_to_pin() - GPIO range GPIO number to pin number translation

 * @range: GPIO range used for the translation

 * @gpio: gpio pin to translate to a pin number

 * @gc: GPIO chip structure from the GPIO subsystem

 * @offset: hardware offset of the GPIO relative to the controller

 *

 * Finds the pin number for a given GPIO using the specified GPIO range

 * as a base for translation. The distinction between linear GPIO ranges
@@ -280,13 +281,13 @@ static int pinctrl_register_pins(struct pinctrl_dev *pctldev, 
 * result of successful pinctrl_get_device_gpio_range calls)!

 */

static inline int gpio_to_pin(struct pinctrl_gpio_range *range,

				unsigned int gpio)

			      struct gpio_chip *gc, unsigned int offset)

{

	unsigned int offset = gpio - range->base;

	unsigned int pin = gc->base + offset - range->base;

	if (range->pins)

		return range->pins[offset];

		return range->pins[pin];

	else

		return range->pin_base + offset;

		return range->pin_base + pin;

}



/**
@@ -777,7 +778,7 @@ bool pinctrl_gpio_can_use_line(struct gpio_chip *gc, unsigned int offset) 
	mutex_lock(&pctldev->mutex);



	/* Convert to the pin controllers number space */

	pin = gpio_to_pin(range, gc->base + offset);

	pin = gpio_to_pin(range, gc, offset);



	result = pinmux_can_be_used_for_gpio(pctldev, pin);
@@ -812,7 +813,7 @@ int pinctrl_gpio_request(struct gpio_chip *gc, unsigned int offset) 
	mutex_lock(&pctldev->mutex);



	/* Convert to the pin controllers number space */

	pin = gpio_to_pin(range, gc->base + offset);

	pin = gpio_to_pin(range, gc, offset);



	ret = pinmux_request_gpio(pctldev, range, pin, gc->base + offset);
@@ -844,7 +845,7 @@ void pinctrl_gpio_free(struct gpio_chip *gc, unsigned int offset) 
	mutex_lock(&pctldev->mutex);



	/* Convert to the pin controllers number space */

	pin = gpio_to_pin(range, gc->base + offset);

	pin = gpio_to_pin(range, gc, offset);



	pinmux_free_gpio(pctldev, pin, range);
@@ -868,7 +869,7 @@ static int pinctrl_gpio_direction(struct gpio_chip *gc, unsigned int offset, 
	mutex_lock(&pctldev->mutex);



	/* Convert to the pin controllers number space */

	pin = gpio_to_pin(range, gc->base + offset);

	pin = gpio_to_pin(range, gc, offset);

	ret = pinmux_gpio_direction(pctldev, range, pin, input);



	mutex_unlock(&pctldev->mutex);
@@ -929,7 +930,7 @@ int pinctrl_gpio_set_config(struct gpio_chip *gc, unsigned int offset, 
		return ret;



	mutex_lock(&pctldev->mutex);

	pin = gpio_to_pin(range, gc->base + offset);

	pin = gpio_to_pin(range, gc, offset);

	ret = pinconf_set_config(pctldev, pin, configs, ARRAY_SIZE(configs));

	mutex_unlock(&pctldev->mutex);