Commit 4eab22e7 authored by Linus Walleij's avatar Linus Walleij
Browse files

gpio: convert remaining users to gpiochip_add_data()



For completion, sweep the floor from all gpiochip_add() usage so
we can remove that function and get rid of the function wrapper
gpiochip_add().

Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 31a89447
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -499,7 +499,7 @@ static int ichx_gpio_probe(struct platform_device *pdev)

init:
	ichx_gpiolib_setup(&ichx_priv.chip);
	err = gpiochip_add(&ichx_priv.chip);
	err = gpiochip_add_data(&ichx_priv.chip, NULL);
	if (err) {
		pr_err("Failed to register GPIOs\n");
		goto add_err;
+1 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ static int iop3xx_gpio_probe(struct platform_device *pdev)
	if (IS_ERR(base))
		return PTR_ERR(base);

	return gpiochip_add(&iop3xx_chip);
	return gpiochip_add_data(&iop3xx_chip, NULL);
}

static struct platform_driver iop3xx_gpio_driver = {
+1 −1
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ static int ttl_probe(struct platform_device *pdev)
	gpio->base = -1;
	gpio->ngpio = 20;

	ret = gpiochip_add(gpio);
	ret = gpiochip_add_data(gpio, NULL);
	if (ret) {
		dev_err(dev, "unable to add GPIO chip\n");
		return ret;
+1 −1
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ static struct gpio_chip ks8695_gpio_chip = {
/* Register the GPIOs */
void ks8695_register_gpios(void)
{
	if (gpiochip_add(&ks8695_gpio_chip))
	if (gpiochip_add_data(&ks8695_gpio_chip, NULL))
		printk(KERN_ERR "Unable to register core GPIOs\n");
}

+1 −1
Original line number Diff line number Diff line
@@ -110,6 +110,6 @@ static struct gpio_chip loongson_chip = {

static int __init loongson_gpio_setup(void)
{
	return gpiochip_add(&loongson_chip);
	return gpiochip_add_data(&loongson_chip, NULL);
}
postcore_initcall(loongson_gpio_setup);
Loading