Merge tag 'pm+acpi-4.6-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[linux-2.6-block.git] / drivers / gpio / gpio-moxart.c

diff --git a/drivers/gpio/gpio-moxart.c b/drivers/gpio/gpio-moxart.c
index ca604538ebf7e74acb523af0c2dc5a7e4ced5777..f02d0b49097817c0264384e58286359d7b5e6199 100644 (file)
--- a/drivers/gpio/gpio-moxart.c
+++ b/drivers/gpio/gpio-moxart.c
@@ -57,13 +57,10 @@ static int moxart_gpio_probe(struct platform_device *pdev)
        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);