Skip to content

Commit a063e57

Browse files
author
Bartosz Golaszewski
committed
pinctrl: remove pinctrl_gpio_can_use_line()
There are no more users of pinctrl_gpio_can_use_line() so remove it. Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> Acked-by: Linus Walleij <linus.walleij@linaro.org>
1 parent c6801e2 commit a063e57

2 files changed

Lines changed: 3 additions & 15 deletions

File tree

drivers/pinctrl/core.c

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -755,7 +755,7 @@ int pinctrl_get_group_selector(struct pinctrl_dev *pctldev,
755755
return -EINVAL;
756756
}
757757

758-
bool pinctrl_gpio_can_use_line(unsigned gpio)
758+
bool pinctrl_gpio_can_use_line_new(struct gpio_chip *gc, unsigned int offset)
759759
{
760760
struct pinctrl_dev *pctldev;
761761
struct pinctrl_gpio_range *range;
@@ -767,26 +767,20 @@ bool pinctrl_gpio_can_use_line(unsigned gpio)
767767
* we're probably dealing with GPIO driver
768768
* without a backing pin controller - bail out.
769769
*/
770-
if (pinctrl_get_device_gpio_range(gpio, &pctldev, &range))
770+
if (pinctrl_get_device_gpio_range(gc->base + offset, &pctldev, &range))
771771
return true;
772772

773773
mutex_lock(&pctldev->mutex);
774774

775775
/* Convert to the pin controllers number space */
776-
pin = gpio_to_pin(range, gpio);
776+
pin = gpio_to_pin(range, gc->base + offset);
777777

778778
result = pinmux_can_be_used_for_gpio(pctldev, pin);
779779

780780
mutex_unlock(&pctldev->mutex);
781781

782782
return result;
783783
}
784-
EXPORT_SYMBOL_GPL(pinctrl_gpio_can_use_line);
785-
786-
bool pinctrl_gpio_can_use_line_new(struct gpio_chip *gc, unsigned int offset)
787-
{
788-
return pinctrl_gpio_can_use_line(gc->base + offset);
789-
}
790784
EXPORT_SYMBOL_GPL(pinctrl_gpio_can_use_line_new);
791785

792786
/* This function is deprecated and will be removed. Don't use. */

include/linux/pinctrl/consumer.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ struct pinctrl_state;
2626
#ifdef CONFIG_PINCTRL
2727

2828
/* External interface to pin control */
29-
bool pinctrl_gpio_can_use_line(unsigned gpio);
3029
bool pinctrl_gpio_can_use_line_new(struct gpio_chip *gc, unsigned int offset);
3130
int pinctrl_gpio_request(unsigned gpio);
3231
int pinctrl_gpio_request_new(struct gpio_chip *gc, unsigned int offset);
@@ -73,11 +72,6 @@ static inline int pinctrl_pm_select_idle_state(struct device *dev)
7372

7473
#else /* !CONFIG_PINCTRL */
7574

76-
static inline bool pinctrl_gpio_can_use_line(unsigned gpio)
77-
{
78-
return true;
79-
}
80-
8175
static inline bool
8276
pinctrl_gpio_can_use_line_new(struct gpio_chip *gc, unsigned int offset)
8377
{

0 commit comments

Comments
 (0)