mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-09-21 20:22:13 +08:00
treewide: rename pinctrl_gpio_direction_input_new()
Now that pinctrl_gpio_direction_input() 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
4fccb263f3
commit
315c46f9b6
@ -346,7 +346,7 @@ static int mvebu_gpio_direction_input(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 input GPIO
|
* an input GPIO
|
||||||
*/
|
*/
|
||||||
ret = pinctrl_gpio_direction_input_new(chip, pin);
|
ret = pinctrl_gpio_direction_input(chip, pin);
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
|
@ -260,7 +260,7 @@ static int pxa_gpio_direction_input(struct gpio_chip *chip, unsigned offset)
|
|||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
if (pxa_gpio_has_pinctrl()) {
|
if (pxa_gpio_has_pinctrl()) {
|
||||||
ret = pinctrl_gpio_direction_input_new(chip, offset);
|
ret = pinctrl_gpio_direction_input(chip, offset);
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
@ -159,7 +159,7 @@ static int rockchip_gpio_set_direction(struct gpio_chip *chip,
|
|||||||
|
|
||||||
|
|
||||||
if (input)
|
if (input)
|
||||||
pinctrl_gpio_direction_input_new(chip, offset);
|
pinctrl_gpio_direction_input(chip, offset);
|
||||||
else
|
else
|
||||||
pinctrl_gpio_direction_output_new(chip, offset);
|
pinctrl_gpio_direction_output_new(chip, offset);
|
||||||
|
|
||||||
|
@ -179,7 +179,7 @@ static int tegra_gpio_direction_input(struct gpio_chip *chip,
|
|||||||
tegra_gpio_mask_write(tgi, GPIO_MSK_OE(tgi, offset), offset, 0);
|
tegra_gpio_mask_write(tgi, GPIO_MSK_OE(tgi, offset), offset, 0);
|
||||||
tegra_gpio_enable(tgi, offset);
|
tegra_gpio_enable(tgi, offset);
|
||||||
|
|
||||||
ret = pinctrl_gpio_direction_input_new(chip, offset);
|
ret = pinctrl_gpio_direction_input(chip, offset);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
dev_err(tgi->dev,
|
dev_err(tgi->dev,
|
||||||
"Failed to set pinctrl input direction of GPIO %d: %d",
|
"Failed to set pinctrl input direction of GPIO %d: %d",
|
||||||
|
@ -130,7 +130,7 @@ static int vf610_gpio_direction_input(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_input_new(chip, gpio);
|
return pinctrl_gpio_direction_input(chip, gpio);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int vf610_gpio_direction_output(struct gpio_chip *chip, unsigned gpio,
|
static int vf610_gpio_direction_output(struct gpio_chip *chip, unsigned gpio,
|
||||||
|
@ -508,7 +508,7 @@ static void cs42l43_gpio_set(struct gpio_chip *chip, unsigned int offset, int va
|
|||||||
|
|
||||||
static int cs42l43_gpio_direction_in(struct gpio_chip *chip, unsigned int offset)
|
static int cs42l43_gpio_direction_in(struct gpio_chip *chip, unsigned int offset)
|
||||||
{
|
{
|
||||||
return pinctrl_gpio_direction_input_new(chip, offset);
|
return pinctrl_gpio_direction_input(chip, offset);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int cs42l43_gpio_direction_out(struct gpio_chip *chip,
|
static int cs42l43_gpio_direction_out(struct gpio_chip *chip,
|
||||||
|
@ -874,7 +874,7 @@ static int pinctrl_gpio_direction(unsigned gpio, bool input)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* pinctrl_gpio_direction_input_new() - request a GPIO pin to go into input mode
|
* pinctrl_gpio_direction_input() - request a GPIO pin to go into input 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
|
||||||
*
|
*
|
||||||
@ -882,11 +882,11 @@ static int pinctrl_gpio_direction(unsigned gpio, bool input)
|
|||||||
* as part of their gpio_direction_input() semantics, platforms and individual
|
* as part of their gpio_direction_input() semantics, platforms and individual
|
||||||
* drivers shall *NOT* touch pin control GPIO calls.
|
* drivers shall *NOT* touch pin control GPIO calls.
|
||||||
*/
|
*/
|
||||||
int pinctrl_gpio_direction_input_new(struct gpio_chip *gc, unsigned int offset)
|
int pinctrl_gpio_direction_input(struct gpio_chip *gc, unsigned int offset)
|
||||||
{
|
{
|
||||||
return pinctrl_gpio_direction(gc->base + offset, true);
|
return pinctrl_gpio_direction(gc->base + offset, true);
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(pinctrl_gpio_direction_input_new);
|
EXPORT_SYMBOL_GPL(pinctrl_gpio_direction_input);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* pinctrl_gpio_direction_output_new() - request a GPIO pin to go into output
|
* pinctrl_gpio_direction_output_new() - request a GPIO pin to go into output
|
||||||
|
@ -1148,7 +1148,7 @@ static int chv_gpio_get_direction(struct gpio_chip *chip, unsigned int offset)
|
|||||||
|
|
||||||
static int chv_gpio_direction_input(struct gpio_chip *chip, unsigned int offset)
|
static int chv_gpio_direction_input(struct gpio_chip *chip, unsigned int offset)
|
||||||
{
|
{
|
||||||
return pinctrl_gpio_direction_input_new(chip, offset);
|
return pinctrl_gpio_direction_input(chip, offset);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int chv_gpio_direction_output(struct gpio_chip *chip, unsigned int offset,
|
static int chv_gpio_direction_output(struct gpio_chip *chip, unsigned int offset,
|
||||||
|
@ -992,7 +992,7 @@ static int intel_gpio_get_direction(struct gpio_chip *chip, unsigned int offset)
|
|||||||
|
|
||||||
static int intel_gpio_direction_input(struct gpio_chip *chip, unsigned int offset)
|
static int intel_gpio_direction_input(struct gpio_chip *chip, unsigned int offset)
|
||||||
{
|
{
|
||||||
return pinctrl_gpio_direction_input_new(chip, offset);
|
return pinctrl_gpio_direction_input(chip, offset);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int intel_gpio_direction_output(struct gpio_chip *chip, unsigned int offset,
|
static int intel_gpio_direction_output(struct gpio_chip *chip, unsigned int offset,
|
||||||
|
@ -541,7 +541,7 @@ static void lp_gpio_set(struct gpio_chip *chip, unsigned int offset, int value)
|
|||||||
|
|
||||||
static int lp_gpio_direction_input(struct gpio_chip *chip, unsigned int offset)
|
static int lp_gpio_direction_input(struct gpio_chip *chip, unsigned int offset)
|
||||||
{
|
{
|
||||||
return pinctrl_gpio_direction_input_new(chip, offset);
|
return pinctrl_gpio_direction_input(chip, offset);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int lp_gpio_direction_output(struct gpio_chip *chip, unsigned int offset,
|
static int lp_gpio_direction_output(struct gpio_chip *chip, unsigned int offset,
|
||||||
|
@ -512,7 +512,7 @@ static void mtk_gpio_set(struct gpio_chip *chip, unsigned int gpio, int value)
|
|||||||
|
|
||||||
static int mtk_gpio_direction_input(struct gpio_chip *chip, unsigned int gpio)
|
static int mtk_gpio_direction_input(struct gpio_chip *chip, unsigned int gpio)
|
||||||
{
|
{
|
||||||
return pinctrl_gpio_direction_input_new(chip, gpio);
|
return pinctrl_gpio_direction_input(chip, gpio);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int mtk_gpio_direction_output(struct gpio_chip *chip, unsigned int gpio,
|
static int mtk_gpio_direction_output(struct gpio_chip *chip, unsigned int gpio,
|
||||||
|
@ -811,7 +811,7 @@ static const struct pinmux_ops mtk_pmx_ops = {
|
|||||||
static int mtk_gpio_direction_input(struct gpio_chip *chip,
|
static int mtk_gpio_direction_input(struct gpio_chip *chip,
|
||||||
unsigned offset)
|
unsigned offset)
|
||||||
{
|
{
|
||||||
return pinctrl_gpio_direction_input_new(chip, offset);
|
return pinctrl_gpio_direction_input(chip, offset);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int mtk_gpio_direction_output(struct gpio_chip *chip,
|
static int mtk_gpio_direction_output(struct gpio_chip *chip,
|
||||||
|
@ -916,7 +916,7 @@ static int mtk_gpio_direction_input(struct gpio_chip *chip, unsigned int gpio)
|
|||||||
if (gpio >= hw->soc->npins)
|
if (gpio >= hw->soc->npins)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
return pinctrl_gpio_direction_input_new(chip, gpio);
|
return pinctrl_gpio_direction_input(chip, gpio);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int mtk_gpio_direction_output(struct gpio_chip *chip, unsigned int gpio,
|
static int mtk_gpio_direction_output(struct gpio_chip *chip, unsigned int gpio,
|
||||||
|
@ -171,7 +171,7 @@ static int npcmgpio_direction_input(struct gpio_chip *chip, unsigned int offset)
|
|||||||
struct npcm7xx_gpio *bank = gpiochip_get_data(chip);
|
struct npcm7xx_gpio *bank = gpiochip_get_data(chip);
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
ret = pinctrl_gpio_direction_input_new(chip, offset);
|
ret = pinctrl_gpio_direction_input(chip, offset);
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
|
@ -173,7 +173,7 @@ static int npcmgpio_direction_input(struct gpio_chip *chip, unsigned int offset)
|
|||||||
struct npcm8xx_gpio *bank = gpiochip_get_data(chip);
|
struct npcm8xx_gpio *bank = gpiochip_get_data(chip);
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
ret = pinctrl_gpio_direction_input_new(chip, offset);
|
ret = pinctrl_gpio_direction_input(chip, offset);
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
|
@ -502,7 +502,7 @@ static void as3722_gpio_set(struct gpio_chip *chip, unsigned offset,
|
|||||||
|
|
||||||
static int as3722_gpio_direction_input(struct gpio_chip *chip, unsigned offset)
|
static int as3722_gpio_direction_input(struct gpio_chip *chip, unsigned offset)
|
||||||
{
|
{
|
||||||
return pinctrl_gpio_direction_input_new(chip, offset);
|
return pinctrl_gpio_direction_input(chip, offset);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int as3722_gpio_direction_output(struct gpio_chip *chip,
|
static int as3722_gpio_direction_output(struct gpio_chip *chip,
|
||||||
|
@ -126,7 +126,7 @@ static int axp20x_gpio_get_reg(unsigned int offset)
|
|||||||
|
|
||||||
static int axp20x_gpio_input(struct gpio_chip *chip, unsigned int offset)
|
static int axp20x_gpio_input(struct gpio_chip *chip, unsigned int offset)
|
||||||
{
|
{
|
||||||
return pinctrl_gpio_direction_input_new(chip, offset);
|
return pinctrl_gpio_direction_input(chip, offset);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int axp20x_gpio_get(struct gpio_chip *chip, unsigned int offset)
|
static int axp20x_gpio_get(struct gpio_chip *chip, unsigned int offset)
|
||||||
|
@ -554,7 +554,7 @@ out:
|
|||||||
|
|
||||||
static int cy8c95x0_gpio_direction_input(struct gpio_chip *gc, unsigned int off)
|
static int cy8c95x0_gpio_direction_input(struct gpio_chip *gc, unsigned int off)
|
||||||
{
|
{
|
||||||
return pinctrl_gpio_direction_input_new(gc, off);
|
return pinctrl_gpio_direction_input(gc, off);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int cy8c95x0_gpio_direction_output(struct gpio_chip *gc,
|
static int cy8c95x0_gpio_direction_output(struct gpio_chip *gc,
|
||||||
|
@ -3563,7 +3563,7 @@ static int ingenic_gpio_get(struct gpio_chip *gc, unsigned int offset)
|
|||||||
static int ingenic_gpio_direction_input(struct gpio_chip *gc,
|
static int ingenic_gpio_direction_input(struct gpio_chip *gc,
|
||||||
unsigned int offset)
|
unsigned int offset)
|
||||||
{
|
{
|
||||||
return pinctrl_gpio_direction_input_new(gc, offset);
|
return pinctrl_gpio_direction_input(gc, offset);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int ingenic_gpio_direction_output(struct gpio_chip *gc,
|
static int ingenic_gpio_direction_output(struct gpio_chip *gc,
|
||||||
|
@ -1779,7 +1779,7 @@ static int ocelot_gpio_get_direction(struct gpio_chip *chip,
|
|||||||
static int ocelot_gpio_direction_input(struct gpio_chip *chip,
|
static int ocelot_gpio_direction_input(struct gpio_chip *chip,
|
||||||
unsigned int offset)
|
unsigned int offset)
|
||||||
{
|
{
|
||||||
return pinctrl_gpio_direction_input_new(chip, offset);
|
return pinctrl_gpio_direction_input(chip, offset);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int ocelot_gpio_direction_output(struct gpio_chip *chip,
|
static int ocelot_gpio_direction_output(struct gpio_chip *chip,
|
||||||
|
@ -289,7 +289,7 @@ static void rk805_gpio_set(struct gpio_chip *chip,
|
|||||||
static int rk805_gpio_direction_input(struct gpio_chip *chip,
|
static int rk805_gpio_direction_input(struct gpio_chip *chip,
|
||||||
unsigned int offset)
|
unsigned int offset)
|
||||||
{
|
{
|
||||||
return pinctrl_gpio_direction_input_new(chip, offset);
|
return pinctrl_gpio_direction_input(chip, offset);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int rk805_gpio_direction_output(struct gpio_chip *chip,
|
static int rk805_gpio_direction_output(struct gpio_chip *chip,
|
||||||
|
@ -719,7 +719,7 @@ static void st_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
|
|||||||
|
|
||||||
static int st_gpio_direction_input(struct gpio_chip *chip, unsigned offset)
|
static int st_gpio_direction_input(struct gpio_chip *chip, unsigned offset)
|
||||||
{
|
{
|
||||||
pinctrl_gpio_direction_input_new(chip, offset);
|
pinctrl_gpio_direction_input(chip, offset);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -164,7 +164,7 @@ static void gpio_pin_set_value(struct sh_pfc_chip *chip, unsigned offset,
|
|||||||
|
|
||||||
static int gpio_pin_direction_input(struct gpio_chip *gc, unsigned offset)
|
static int gpio_pin_direction_input(struct gpio_chip *gc, unsigned offset)
|
||||||
{
|
{
|
||||||
return pinctrl_gpio_direction_input_new(gc, offset);
|
return pinctrl_gpio_direction_input(gc, offset);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int gpio_pin_direction_output(struct gpio_chip *gc, unsigned offset,
|
static int gpio_pin_direction_output(struct gpio_chip *gc, unsigned offset,
|
||||||
|
@ -241,7 +241,7 @@ static void stm32_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
|
|||||||
|
|
||||||
static int stm32_gpio_direction_input(struct gpio_chip *chip, unsigned offset)
|
static int stm32_gpio_direction_input(struct gpio_chip *chip, unsigned offset)
|
||||||
{
|
{
|
||||||
return pinctrl_gpio_direction_input_new(chip, offset);
|
return pinctrl_gpio_direction_input(chip, offset);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int stm32_gpio_direction_output(struct gpio_chip *chip,
|
static int stm32_gpio_direction_output(struct gpio_chip *chip,
|
||||||
|
@ -528,7 +528,7 @@ static void wmt_gpio_set_value(struct gpio_chip *chip, unsigned offset,
|
|||||||
|
|
||||||
static int wmt_gpio_direction_input(struct gpio_chip *chip, unsigned offset)
|
static int wmt_gpio_direction_input(struct gpio_chip *chip, unsigned offset)
|
||||||
{
|
{
|
||||||
return pinctrl_gpio_direction_input_new(chip, offset);
|
return pinctrl_gpio_direction_input(chip, offset);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int wmt_gpio_direction_output(struct gpio_chip *chip, unsigned offset,
|
static int wmt_gpio_direction_output(struct gpio_chip *chip, unsigned offset,
|
||||||
|
@ -29,8 +29,8 @@ struct pinctrl_state;
|
|||||||
bool pinctrl_gpio_can_use_line(struct gpio_chip *gc, unsigned int offset);
|
bool pinctrl_gpio_can_use_line(struct gpio_chip *gc, unsigned int offset);
|
||||||
int pinctrl_gpio_request(struct gpio_chip *gc, unsigned int offset);
|
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_new(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_new(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,
|
||||||
@ -85,7 +85,7 @@ pinctrl_gpio_free(struct gpio_chip *gc, unsigned int offset)
|
|||||||
}
|
}
|
||||||
|
|
||||||
static inline int
|
static inline int
|
||||||
pinctrl_gpio_direction_input_new(struct gpio_chip *gc, unsigned int offset)
|
pinctrl_gpio_direction_input(struct gpio_chip *gc, unsigned int offset)
|
||||||
{
|
{
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user