mirror of
https://github.com/torvalds/linux.git
synced 2024-11-12 23:23:03 +00:00
treewide: rename pinctrl_gpio_direction_output_new()
Now that pinctrl_gpio_direction_output() is no longer used, let's drop the '_new' suffix from its improved variant. Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> Acked-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
parent
315c46f9b6
commit
b679d6c06b
@ -366,7 +366,7 @@ static int mvebu_gpio_direction_output(struct gpio_chip *chip, unsigned int pin,
|
|||||||
* Check with the pinctrl driver whether this pin is usable as
|
* Check with the pinctrl driver whether this pin is usable as
|
||||||
* an output GPIO
|
* an output GPIO
|
||||||
*/
|
*/
|
||||||
ret = pinctrl_gpio_direction_output_new(chip, pin);
|
ret = pinctrl_gpio_direction_output(chip, pin);
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
|
@ -289,7 +289,7 @@ static int pxa_gpio_direction_output(struct gpio_chip *chip,
|
|||||||
writel_relaxed(mask, base + (value ? GPSR_OFFSET : GPCR_OFFSET));
|
writel_relaxed(mask, base + (value ? GPSR_OFFSET : GPCR_OFFSET));
|
||||||
|
|
||||||
if (pxa_gpio_has_pinctrl()) {
|
if (pxa_gpio_has_pinctrl()) {
|
||||||
ret = pinctrl_gpio_direction_output_new(chip, offset);
|
ret = pinctrl_gpio_direction_output(chip, offset);
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
@ -161,7 +161,7 @@ static int rockchip_gpio_set_direction(struct gpio_chip *chip,
|
|||||||
if (input)
|
if (input)
|
||||||
pinctrl_gpio_direction_input(chip, offset);
|
pinctrl_gpio_direction_input(chip, offset);
|
||||||
else
|
else
|
||||||
pinctrl_gpio_direction_output_new(chip, offset);
|
pinctrl_gpio_direction_output(chip, offset);
|
||||||
|
|
||||||
raw_spin_lock_irqsave(&bank->slock, flags);
|
raw_spin_lock_irqsave(&bank->slock, flags);
|
||||||
rockchip_gpio_writel_bit(bank, offset, data, bank->gpio_regs->port_ddr);
|
rockchip_gpio_writel_bit(bank, offset, data, bank->gpio_regs->port_ddr);
|
||||||
|
@ -199,7 +199,7 @@ static int tegra_gpio_direction_output(struct gpio_chip *chip,
|
|||||||
tegra_gpio_mask_write(tgi, GPIO_MSK_OE(tgi, offset), offset, 1);
|
tegra_gpio_mask_write(tgi, GPIO_MSK_OE(tgi, offset), offset, 1);
|
||||||
tegra_gpio_enable(tgi, offset);
|
tegra_gpio_enable(tgi, offset);
|
||||||
|
|
||||||
ret = pinctrl_gpio_direction_output_new(chip, offset);
|
ret = pinctrl_gpio_direction_output(chip, offset);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
dev_err(tgi->dev,
|
dev_err(tgi->dev,
|
||||||
"Failed to set pinctrl output direction of GPIO %d: %d",
|
"Failed to set pinctrl output direction of GPIO %d: %d",
|
||||||
|
@ -148,7 +148,7 @@ static int vf610_gpio_direction_output(struct gpio_chip *chip, unsigned gpio,
|
|||||||
vf610_gpio_writel(val, port->gpio_base + GPIO_PDDR);
|
vf610_gpio_writel(val, port->gpio_base + GPIO_PDDR);
|
||||||
}
|
}
|
||||||
|
|
||||||
return pinctrl_gpio_direction_output_new(chip, gpio);
|
return pinctrl_gpio_direction_output(chip, gpio);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void vf610_gpio_irq_handler(struct irq_desc *desc)
|
static void vf610_gpio_irq_handler(struct irq_desc *desc)
|
||||||
|
@ -516,7 +516,7 @@ static int cs42l43_gpio_direction_out(struct gpio_chip *chip,
|
|||||||
{
|
{
|
||||||
cs42l43_gpio_set(chip, offset, value);
|
cs42l43_gpio_set(chip, offset, value);
|
||||||
|
|
||||||
return pinctrl_gpio_direction_output_new(chip, offset);
|
return pinctrl_gpio_direction_output(chip, offset);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int cs42l43_gpio_add_pin_ranges(struct gpio_chip *chip)
|
static int cs42l43_gpio_add_pin_ranges(struct gpio_chip *chip)
|
||||||
|
@ -1098,7 +1098,7 @@ static int lochnagar_gpio_direction_out(struct gpio_chip *chip,
|
|||||||
{
|
{
|
||||||
lochnagar_gpio_set(chip, offset, value);
|
lochnagar_gpio_set(chip, offset, value);
|
||||||
|
|
||||||
return pinctrl_gpio_direction_output_new(chip, offset);
|
return pinctrl_gpio_direction_output(chip, offset);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int lochnagar_fill_func_groups(struct lochnagar_pin_priv *priv)
|
static int lochnagar_fill_func_groups(struct lochnagar_pin_priv *priv)
|
||||||
|
@ -889,8 +889,7 @@ int pinctrl_gpio_direction_input(struct gpio_chip *gc, unsigned int offset)
|
|||||||
EXPORT_SYMBOL_GPL(pinctrl_gpio_direction_input);
|
EXPORT_SYMBOL_GPL(pinctrl_gpio_direction_input);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* pinctrl_gpio_direction_output_new() - request a GPIO pin to go into output
|
* pinctrl_gpio_direction_output() - request a GPIO pin to go into output mode
|
||||||
* mode
|
|
||||||
* @gc: GPIO chip structure from the GPIO subsystem
|
* @gc: GPIO chip structure from the GPIO subsystem
|
||||||
* @offset: hardware offset of the GPIO relative to the controller
|
* @offset: hardware offset of the GPIO relative to the controller
|
||||||
*
|
*
|
||||||
@ -898,11 +897,11 @@ EXPORT_SYMBOL_GPL(pinctrl_gpio_direction_input);
|
|||||||
* as part of their gpio_direction_output() semantics, platforms and individual
|
* as part of their gpio_direction_output() semantics, platforms and individual
|
||||||
* drivers shall *NOT* touch pin control GPIO calls.
|
* drivers shall *NOT* touch pin control GPIO calls.
|
||||||
*/
|
*/
|
||||||
int pinctrl_gpio_direction_output_new(struct gpio_chip *gc, unsigned int offset)
|
int pinctrl_gpio_direction_output(struct gpio_chip *gc, unsigned int offset)
|
||||||
{
|
{
|
||||||
return pinctrl_gpio_direction(gc->base + offset, false);
|
return pinctrl_gpio_direction(gc->base + offset, false);
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(pinctrl_gpio_direction_output_new);
|
EXPORT_SYMBOL_GPL(pinctrl_gpio_direction_output);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* pinctrl_gpio_set_config_new() - Apply config to given GPIO pin
|
* pinctrl_gpio_set_config_new() - Apply config to given GPIO pin
|
||||||
|
@ -1155,7 +1155,7 @@ static int chv_gpio_direction_output(struct gpio_chip *chip, unsigned int offset
|
|||||||
int value)
|
int value)
|
||||||
{
|
{
|
||||||
chv_gpio_set(chip, offset, value);
|
chv_gpio_set(chip, offset, value);
|
||||||
return pinctrl_gpio_direction_output_new(chip, offset);
|
return pinctrl_gpio_direction_output(chip, offset);
|
||||||
}
|
}
|
||||||
|
|
||||||
static const struct gpio_chip chv_gpio_chip = {
|
static const struct gpio_chip chv_gpio_chip = {
|
||||||
|
@ -999,7 +999,7 @@ static int intel_gpio_direction_output(struct gpio_chip *chip, unsigned int offs
|
|||||||
int value)
|
int value)
|
||||||
{
|
{
|
||||||
intel_gpio_set(chip, offset, value);
|
intel_gpio_set(chip, offset, value);
|
||||||
return pinctrl_gpio_direction_output_new(chip, offset);
|
return pinctrl_gpio_direction_output(chip, offset);
|
||||||
}
|
}
|
||||||
|
|
||||||
static const struct gpio_chip intel_gpio_chip = {
|
static const struct gpio_chip intel_gpio_chip = {
|
||||||
|
@ -549,7 +549,7 @@ static int lp_gpio_direction_output(struct gpio_chip *chip, unsigned int offset,
|
|||||||
{
|
{
|
||||||
lp_gpio_set(chip, offset, value);
|
lp_gpio_set(chip, offset, value);
|
||||||
|
|
||||||
return pinctrl_gpio_direction_output_new(chip, offset);
|
return pinctrl_gpio_direction_output(chip, offset);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int lp_gpio_get_direction(struct gpio_chip *chip, unsigned int offset)
|
static int lp_gpio_get_direction(struct gpio_chip *chip, unsigned int offset)
|
||||||
|
@ -520,7 +520,7 @@ static int mtk_gpio_direction_output(struct gpio_chip *chip, unsigned int gpio,
|
|||||||
{
|
{
|
||||||
mtk_gpio_set(chip, gpio, value);
|
mtk_gpio_set(chip, gpio, value);
|
||||||
|
|
||||||
return pinctrl_gpio_direction_output_new(chip, gpio);
|
return pinctrl_gpio_direction_output(chip, gpio);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int mtk_gpio_to_irq(struct gpio_chip *chip, unsigned int offset)
|
static int mtk_gpio_to_irq(struct gpio_chip *chip, unsigned int offset)
|
||||||
|
@ -818,7 +818,7 @@ static int mtk_gpio_direction_output(struct gpio_chip *chip,
|
|||||||
unsigned offset, int value)
|
unsigned offset, int value)
|
||||||
{
|
{
|
||||||
mtk_gpio_set(chip, offset, value);
|
mtk_gpio_set(chip, offset, value);
|
||||||
return pinctrl_gpio_direction_output_new(chip, offset);
|
return pinctrl_gpio_direction_output(chip, offset);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int mtk_gpio_get_direction(struct gpio_chip *chip, unsigned offset)
|
static int mtk_gpio_get_direction(struct gpio_chip *chip, unsigned offset)
|
||||||
|
@ -929,7 +929,7 @@ static int mtk_gpio_direction_output(struct gpio_chip *chip, unsigned int gpio,
|
|||||||
|
|
||||||
mtk_gpio_set(chip, gpio, value);
|
mtk_gpio_set(chip, gpio, value);
|
||||||
|
|
||||||
return pinctrl_gpio_direction_output_new(chip, gpio);
|
return pinctrl_gpio_direction_output(chip, gpio);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int mtk_gpio_to_irq(struct gpio_chip *chip, unsigned int offset)
|
static int mtk_gpio_to_irq(struct gpio_chip *chip, unsigned int offset)
|
||||||
|
@ -188,7 +188,7 @@ static int npcmgpio_direction_output(struct gpio_chip *chip,
|
|||||||
dev_dbg(chip->parent, "gpio_direction_output: offset%d = %x\n", offset,
|
dev_dbg(chip->parent, "gpio_direction_output: offset%d = %x\n", offset,
|
||||||
value);
|
value);
|
||||||
|
|
||||||
ret = pinctrl_gpio_direction_output_new(chip, offset);
|
ret = pinctrl_gpio_direction_output(chip, offset);
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
|
@ -186,7 +186,7 @@ static int npcmgpio_direction_output(struct gpio_chip *chip,
|
|||||||
struct npcm8xx_gpio *bank = gpiochip_get_data(chip);
|
struct npcm8xx_gpio *bank = gpiochip_get_data(chip);
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
ret = pinctrl_gpio_direction_output_new(chip, offset);
|
ret = pinctrl_gpio_direction_output(chip, offset);
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
|
@ -509,7 +509,7 @@ static int as3722_gpio_direction_output(struct gpio_chip *chip,
|
|||||||
unsigned offset, int value)
|
unsigned offset, int value)
|
||||||
{
|
{
|
||||||
as3722_gpio_set(chip, offset, value);
|
as3722_gpio_set(chip, offset, value);
|
||||||
return pinctrl_gpio_direction_output_new(chip, offset);
|
return pinctrl_gpio_direction_output(chip, offset);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int as3722_gpio_to_irq(struct gpio_chip *chip, unsigned offset)
|
static int as3722_gpio_to_irq(struct gpio_chip *chip, unsigned offset)
|
||||||
|
@ -571,7 +571,7 @@ static int cy8c95x0_gpio_direction_output(struct gpio_chip *gc,
|
|||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
return pinctrl_gpio_direction_output_new(gc, off);
|
return pinctrl_gpio_direction_output(gc, off);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int cy8c95x0_gpio_get_value(struct gpio_chip *gc, unsigned int off)
|
static int cy8c95x0_gpio_get_value(struct gpio_chip *gc, unsigned int off)
|
||||||
|
@ -3570,7 +3570,7 @@ static int ingenic_gpio_direction_output(struct gpio_chip *gc,
|
|||||||
unsigned int offset, int value)
|
unsigned int offset, int value)
|
||||||
{
|
{
|
||||||
ingenic_gpio_set(gc, offset, value);
|
ingenic_gpio_set(gc, offset, value);
|
||||||
return pinctrl_gpio_direction_output_new(gc, offset);
|
return pinctrl_gpio_direction_output(gc, offset);
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void ingenic_config_pin(struct ingenic_pinctrl *jzpc,
|
static inline void ingenic_config_pin(struct ingenic_pinctrl *jzpc,
|
||||||
@ -4054,7 +4054,7 @@ static int ingenic_pinconf_set(struct pinctrl_dev *pctldev, unsigned int pin,
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case PIN_CONFIG_OUTPUT:
|
case PIN_CONFIG_OUTPUT:
|
||||||
ret = pinctrl_gpio_direction_output_new(jzpc->gc,
|
ret = pinctrl_gpio_direction_output(jzpc->gc,
|
||||||
pin - jzpc->gc->base);
|
pin - jzpc->gc->base);
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
|
@ -1795,7 +1795,7 @@ static int ocelot_gpio_direction_output(struct gpio_chip *chip,
|
|||||||
regmap_write(info->map, REG(OCELOT_GPIO_OUT_CLR, info, offset),
|
regmap_write(info->map, REG(OCELOT_GPIO_OUT_CLR, info, offset),
|
||||||
pin);
|
pin);
|
||||||
|
|
||||||
return pinctrl_gpio_direction_output_new(chip, offset);
|
return pinctrl_gpio_direction_output(chip, offset);
|
||||||
}
|
}
|
||||||
|
|
||||||
static const struct gpio_chip ocelot_gpiolib_chip = {
|
static const struct gpio_chip ocelot_gpiolib_chip = {
|
||||||
|
@ -296,7 +296,7 @@ static int rk805_gpio_direction_output(struct gpio_chip *chip,
|
|||||||
unsigned int offset, int value)
|
unsigned int offset, int value)
|
||||||
{
|
{
|
||||||
rk805_gpio_set(chip, offset, value);
|
rk805_gpio_set(chip, offset, value);
|
||||||
return pinctrl_gpio_direction_output_new(chip, offset);
|
return pinctrl_gpio_direction_output(chip, offset);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int rk805_gpio_get_direction(struct gpio_chip *chip, unsigned int offset)
|
static int rk805_gpio_get_direction(struct gpio_chip *chip, unsigned int offset)
|
||||||
|
@ -730,7 +730,7 @@ static int st_gpio_direction_output(struct gpio_chip *chip,
|
|||||||
struct st_gpio_bank *bank = gpiochip_get_data(chip);
|
struct st_gpio_bank *bank = gpiochip_get_data(chip);
|
||||||
|
|
||||||
__st_gpio_set(bank, offset, value);
|
__st_gpio_set(bank, offset, value);
|
||||||
pinctrl_gpio_direction_output_new(chip, offset);
|
pinctrl_gpio_direction_output(chip, offset);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -172,7 +172,7 @@ static int gpio_pin_direction_output(struct gpio_chip *gc, unsigned offset,
|
|||||||
{
|
{
|
||||||
gpio_pin_set_value(gpiochip_get_data(gc), offset, value);
|
gpio_pin_set_value(gpiochip_get_data(gc), offset, value);
|
||||||
|
|
||||||
return pinctrl_gpio_direction_output_new(gc, offset);
|
return pinctrl_gpio_direction_output(gc, offset);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int gpio_pin_get(struct gpio_chip *gc, unsigned offset)
|
static int gpio_pin_get(struct gpio_chip *gc, unsigned offset)
|
||||||
|
@ -250,7 +250,7 @@ static int stm32_gpio_direction_output(struct gpio_chip *chip,
|
|||||||
struct stm32_gpio_bank *bank = gpiochip_get_data(chip);
|
struct stm32_gpio_bank *bank = gpiochip_get_data(chip);
|
||||||
|
|
||||||
__stm32_gpio_set(bank, offset, value);
|
__stm32_gpio_set(bank, offset, value);
|
||||||
pinctrl_gpio_direction_output_new(chip, offset);
|
pinctrl_gpio_direction_output(chip, offset);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -535,7 +535,7 @@ static int wmt_gpio_direction_output(struct gpio_chip *chip, unsigned offset,
|
|||||||
int value)
|
int value)
|
||||||
{
|
{
|
||||||
wmt_gpio_set_value(chip, offset, value);
|
wmt_gpio_set_value(chip, offset, value);
|
||||||
return pinctrl_gpio_direction_output_new(chip, offset);
|
return pinctrl_gpio_direction_output(chip, offset);
|
||||||
}
|
}
|
||||||
|
|
||||||
static const struct gpio_chip wmt_gpio_chip = {
|
static const struct gpio_chip wmt_gpio_chip = {
|
||||||
|
@ -31,8 +31,8 @@ int pinctrl_gpio_request(struct gpio_chip *gc, unsigned int offset);
|
|||||||
void pinctrl_gpio_free(struct gpio_chip *gc, unsigned int offset);
|
void pinctrl_gpio_free(struct gpio_chip *gc, unsigned int offset);
|
||||||
int pinctrl_gpio_direction_input(struct gpio_chip *gc,
|
int pinctrl_gpio_direction_input(struct gpio_chip *gc,
|
||||||
unsigned int offset);
|
unsigned int offset);
|
||||||
int pinctrl_gpio_direction_output_new(struct gpio_chip *gc,
|
int pinctrl_gpio_direction_output(struct gpio_chip *gc,
|
||||||
unsigned int offset);
|
unsigned int offset);
|
||||||
int pinctrl_gpio_set_config_new(struct gpio_chip *gc, unsigned int offset,
|
int pinctrl_gpio_set_config_new(struct gpio_chip *gc, unsigned int offset,
|
||||||
unsigned long config);
|
unsigned long config);
|
||||||
|
|
||||||
@ -91,7 +91,7 @@ pinctrl_gpio_direction_input(struct gpio_chip *gc, unsigned int offset)
|
|||||||
}
|
}
|
||||||
|
|
||||||
static inline int
|
static inline int
|
||||||
pinctrl_gpio_direction_output_new(struct gpio_chip *gc, unsigned int offset)
|
pinctrl_gpio_direction_output(struct gpio_chip *gc, unsigned int offset)
|
||||||
{
|
{
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user