GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-06 06:37:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gpio: replace trivial implementations of request/free with generic one

Browse source 
Replace all trivial request/free callbacks that do nothing but call into
pinctrl code with the generic versions.

Signed-off-by: Jonas Gorski <jogo@openwrt.org>
Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: James Hogan <james.hogan@imgtec.com>
Acked-by: Stefan Agner <stefan@agner.ch>
Acked-by: Joachim Eastwood <manabian@gmail.com>
Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Jonas Gorski 2015-10-11 17:34:16 +02:00 • committed by Linus Walleij
parent c771c2f484
commit 203f0daafd
6 changed files with 12 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/gpio/gpio-lpc18xx.c
View file

@ -36,16 +36,6 @@ static inline struct lpc18xx_gpio_chip *to_lpc18xx_gpio(struct gpio_chip *chip)
return container_of(chip, struct lpc18xx_gpio_chip, gpio); return container_of(chip, struct lpc18xx_gpio_chip, gpio);
} }
static int lpc18xx_gpio_request(struct gpio_chip *chip, unsigned offset)
{
return pinctrl_request_gpio(offset);
}
static void lpc18xx_gpio_free(struct gpio_chip *chip, unsigned offset)
{
pinctrl_free_gpio(offset);
}
static void lpc18xx_gpio_set(struct gpio_chip *chip, unsigned offset, int value) static void lpc18xx_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
{ {
struct lpc18xx_gpio_chip *gc = to_lpc18xx_gpio(chip); struct lpc18xx_gpio_chip *gc = to_lpc18xx_gpio(chip);
@ -95,8 +85,8 @@ static int lpc18xx_gpio_direction_output(struct gpio_chip *chip,
static struct gpio_chip lpc18xx_chip = { static struct gpio_chip lpc18xx_chip = {
.label = "lpc18xx/43xx-gpio", .label = "lpc18xx/43xx-gpio",
.request = lpc18xx_gpio_request, .request = gpiochip_generic_request,
.free = lpc18xx_gpio_free, .free = gpiochip_generic_free,
.direction_input = lpc18xx_gpio_direction_input, .direction_input = lpc18xx_gpio_direction_input,
.direction_output = lpc18xx_gpio_direction_output, .direction_output = lpc18xx_gpio_direction_output,
.set = lpc18xx_gpio_set, .set = lpc18xx_gpio_set,

14
drivers/gpio/gpio-moxart.c
View file

@ -29,16 +29,6 @@
#define GPIO_DATA_IN 0x04 #define GPIO_DATA_IN 0x04
#define GPIO_PIN_DIRECTION 0x08 #define GPIO_PIN_DIRECTION 0x08
static int moxart_gpio_request(struct gpio_chip *chip, unsigned offset)
{
return pinctrl_request_gpio(offset);
}
static void moxart_gpio_free(struct gpio_chip *chip, unsigned offset)
{
pinctrl_free_gpio(offset);
}
static int moxart_gpio_probe(struct platform_device *pdev) static int moxart_gpio_probe(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
@ -66,8 +56,8 @@ static int moxart_gpio_probe(struct platform_device *pdev)
} }
bgc->gc.label = "moxart-gpio"; bgc->gc.label = "moxart-gpio";
bgc->gc.request = moxart_gpio_request; bgc->gc.request = gpiochip_generic_request;
bgc->gc.free = moxart_gpio_free; bgc->gc.free = gpiochip_generic_free;
bgc->data = bgc->read_reg(bgc->reg_set); bgc->data = bgc->read_reg(bgc->reg_set);
bgc->gc.base = 0; bgc->gc.base = 0;
bgc->gc.ngpio = 32; bgc->gc.ngpio = 32;

14
drivers/gpio/gpio-mvebu.c
View file

@ -185,16 +185,6 @@ static void __iomem *mvebu_gpioreg_level_mask(struct mvebu_gpio_chip *mvchip)
* Functions implementing the gpio_chip methods * Functions implementing the gpio_chip methods
*/ */
static int mvebu_gpio_request(struct gpio_chip *chip, unsigned pin)
{
return pinctrl_request_gpio(chip->base + pin);
}
static void mvebu_gpio_free(struct gpio_chip *chip, unsigned pin)
{
pinctrl_free_gpio(chip->base + pin);
}
static void mvebu_gpio_set(struct gpio_chip *chip, unsigned pin, int value) static void mvebu_gpio_set(struct gpio_chip *chip, unsigned pin, int value)
{ {
struct mvebu_gpio_chip *mvchip = struct mvebu_gpio_chip *mvchip =
@ -709,8 +699,8 @@ static int mvebu_gpio_probe(struct platform_device *pdev)
mvchip->soc_variant = soc_variant; mvchip->soc_variant = soc_variant;
mvchip->chip.label = dev_name(&pdev->dev); mvchip->chip.label = dev_name(&pdev->dev);
mvchip->chip.dev = &pdev->dev; mvchip->chip.dev = &pdev->dev;
mvchip->chip.request = mvebu_gpio_request; mvchip->chip.request = gpiochip_generic_request;
mvchip->chip.free = mvebu_gpio_free; mvchip->chip.free = gpiochip_generic_free;
mvchip->chip.direction_input = mvebu_gpio_direction_input; mvchip->chip.direction_input = mvebu_gpio_direction_input;
mvchip->chip.get = mvebu_gpio_get; mvchip->chip.get = mvebu_gpio_get;
mvchip->chip.direction_output = mvebu_gpio_direction_output; mvchip->chip.direction_output = mvebu_gpio_direction_output;

14
drivers/gpio/gpio-tb10x.c
View file

@ -138,16 +138,6 @@ static int tb10x_gpio_direction_out(struct gpio_chip *chip,
return 0; return 0;
} }
static int tb10x_gpio_request(struct gpio_chip *chip, unsigned offset)
{
return pinctrl_request_gpio(chip->base + offset);
}
static void tb10x_gpio_free(struct gpio_chip *chip, unsigned offset)
{
pinctrl_free_gpio(chip->base + offset);
}
static int tb10x_gpio_to_irq(struct gpio_chip *chip, unsigned offset) static int tb10x_gpio_to_irq(struct gpio_chip *chip, unsigned offset)
{ {
struct tb10x_gpio *tb10x_gpio = to_tb10x_gpio(chip); struct tb10x_gpio *tb10x_gpio = to_tb10x_gpio(chip);
@ -213,8 +203,8 @@ static int tb10x_gpio_probe(struct platform_device *pdev)
tb10x_gpio->gc.get = tb10x_gpio_get; tb10x_gpio->gc.get = tb10x_gpio_get;
tb10x_gpio->gc.direction_output = tb10x_gpio_direction_out; tb10x_gpio->gc.direction_output = tb10x_gpio_direction_out;
tb10x_gpio->gc.set = tb10x_gpio_set; tb10x_gpio->gc.set = tb10x_gpio_set;
tb10x_gpio->gc.request = tb10x_gpio_request; tb10x_gpio->gc.request = gpiochip_generic_request;
tb10x_gpio->gc.free = tb10x_gpio_free; tb10x_gpio->gc.free = gpiochip_generic_free;
tb10x_gpio->gc.base = -1; tb10x_gpio->gc.base = -1;
tb10x_gpio->gc.ngpio = ngpio; tb10x_gpio->gc.ngpio = ngpio;
tb10x_gpio->gc.can_sleep = false; tb10x_gpio->gc.can_sleep = false;

14
drivers/gpio/gpio-tz1090-pdc.c
View file

@ -137,16 +137,6 @@ static void tz1090_pdc_gpio_set(struct gpio_chip *chip, unsigned int offset,
__global_unlock2(lstat); __global_unlock2(lstat);
} }
static int tz1090_pdc_gpio_request(struct gpio_chip *chip, unsigned int offset)
{
return pinctrl_request_gpio(chip->base + offset);
}
static void tz1090_pdc_gpio_free(struct gpio_chip *chip, unsigned int offset)
{
pinctrl_free_gpio(chip->base + offset);
}
static int tz1090_pdc_gpio_to_irq(struct gpio_chip *chip, unsigned int offset) static int tz1090_pdc_gpio_to_irq(struct gpio_chip *chip, unsigned int offset)
{ {
struct tz1090_pdc_gpio *priv = to_pdc(chip); struct tz1090_pdc_gpio *priv = to_pdc(chip);
@ -203,8 +193,8 @@ static int tz1090_pdc_gpio_probe(struct platform_device *pdev)
priv->chip.direction_output = tz1090_pdc_gpio_direction_output; priv->chip.direction_output = tz1090_pdc_gpio_direction_output;
priv->chip.get = tz1090_pdc_gpio_get; priv->chip.get = tz1090_pdc_gpio_get;
priv->chip.set = tz1090_pdc_gpio_set; priv->chip.set = tz1090_pdc_gpio_set;
priv->chip.free = tz1090_pdc_gpio_free; priv->chip.free = gpiochip_generic_free;
priv->chip.request = tz1090_pdc_gpio_request; priv->chip.request = gpiochip_generic_request;
priv->chip.to_irq = tz1090_pdc_gpio_to_irq; priv->chip.to_irq = tz1090_pdc_gpio_to_irq;
priv->chip.of_node = np; priv->chip.of_node = np;

14
drivers/gpio/gpio-vf610.c
View file

@ -82,16 +82,6 @@ static inline u32 vf610_gpio_readl(void __iomem *reg)
return readl_relaxed(reg); return readl_relaxed(reg);
} }
static int vf610_gpio_request(struct gpio_chip *chip, unsigned offset)
{
return pinctrl_request_gpio(chip->base + offset);
}
static void vf610_gpio_free(struct gpio_chip *chip, unsigned offset)
{
pinctrl_free_gpio(chip->base + offset);
}
static int vf610_gpio_get(struct gpio_chip *gc, unsigned int gpio) static int vf610_gpio_get(struct gpio_chip *gc, unsigned int gpio)
{ {
struct vf610_gpio_port *port = to_vf610_gp(gc); struct vf610_gpio_port *port = to_vf610_gp(gc);
@ -264,8 +254,8 @@ static int vf610_gpio_probe(struct platform_device *pdev)
gc->ngpio = VF610_GPIO_PER_PORT; gc->ngpio = VF610_GPIO_PER_PORT;
gc->base = of_alias_get_id(np, "gpio") * VF610_GPIO_PER_PORT; gc->base = of_alias_get_id(np, "gpio") * VF610_GPIO_PER_PORT;
gc->request = vf610_gpio_request; gc->request = gpiochip_generic_request;
gc->free = vf610_gpio_free; gc->free = gpiochip_generic_free;
gc->direction_input = vf610_gpio_direction_input; gc->direction_input = vf610_gpio_direction_input;
gc->get = vf610_gpio_get; gc->get = vf610_gpio_get;
gc->direction_output = vf610_gpio_direction_output; gc->direction_output = vf610_gpio_direction_output;