Merge branch 'devm-gpiochip-add-data' into devel
authorLinus Walleij <linus.walleij@linaro.org>
Tue, 8 Mar 2016 07:41:41 +0000 (14:41 +0700)
committerLinus Walleij <linus.walleij@linaro.org>
Tue, 8 Mar 2016 07:41:41 +0000 (14:41 +0700)
1  2 
drivers/gpio/gpio-moxart.c
drivers/gpio/gpiolib.c

index f7cf5930fbef910b7a85646a46c6318fa730674f,869002b7a571a70c092e8c2dff6b136188b4e06f..f02d0b49097817c0264384e58286359d7b5e6199
@@@ -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);
Simple merge