From: Linus Walleij <linus.walleij@linaro.org>
Date: Tue, 8 Mar 2016 07:41:41 +0000 (+0700)
Subject: Merge branch 'devm-gpiochip-add-data' into devel
X-Git-Tag: v4.6-rc1~108^2~20
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=016bf20829fa00f5e64805f77b7677365151f4af;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'devm-gpiochip-add-data' into devel
---

016bf20829fa00f5e64805f77b7677365151f4af
diff --cc drivers/gpio/gpio-moxart.c
index f7cf5930fbef9,869002b7a571a..f02d0b4909781
--- a/drivers/gpio/gpio-moxart.c
+++ b/drivers/gpio/gpio-moxart.c
@@@ -57,10 -57,13 +57,10 @@@ static int moxart_gpio_probe(struct pla
  	gc->label = "moxart-gpio";
  	gc->request = gpiochip_generic_request;
  	gc->free = gpiochip_generic_free;
 -	gc->bgpio_data = gc->read_reg(gc->reg_set);
  	gc->base = 0;
 -	gc->ngpio = 32;
 -	gc->parent = dev;
  	gc->owner = THIS_MODULE;
  
- 	ret = gpiochip_add_data(gc, NULL);
+ 	ret = devm_gpiochip_add_data(dev, gc, NULL);
  	if (ret) {
  		dev_err(dev, "%s: gpiochip_add failed\n",
  			dev->of_node->full_name);