Merge remote-tracking branches 'regulator/topic/tps65218' and 'regulator/topic/tps800...

[deliverable/linux.git] / drivers / pinctrl / pinctrl-xway.c

diff --git a/drivers/pinctrl/pinctrl-xway.c b/drivers/pinctrl/pinctrl-xway.c
index dac88a2a1693c2a95c7a3e3ffb2612648db1ed45..dd85ad1807f52f36b5ea0fa4bf1639e7f4b42622 100644 (file)
--- a/drivers/pinctrl/pinctrl-xway.c
+++ b/drivers/pinctrl/pinctrl-xway.c
@@ -1647,7 +1647,7 @@ static struct pinctrl_xway_soc danube_pinctrl = {
        .funcs = danube_funcs,
        .num_funcs = ARRAY_SIZE(danube_funcs),
        .exin = danube_exin_pin_map,
-       .num-exin = 3
+       .num_exin = 3
 };
 
 /* XWAY xRX100 Family */
@@ -1748,9 +1748,9 @@ static int pinmux_xway_probe(struct platform_device *pdev)
        }
        xway_pctrl_desc.pins = xway_info.pads;
 
-       /* load the gpio chip */
+       /* register the gpio chip */
        xway_chip.parent = &pdev->dev;
-       ret = gpiochip_add(&xway_chip);
+       ret = devm_gpiochip_add_data(&pdev->dev, &xway_chip, NULL);
        if (ret) {
                dev_err(&pdev->dev, "Failed to register gpio chip\n");
                return ret;
@@ -1773,7 +1773,6 @@ static int pinmux_xway_probe(struct platform_device *pdev)
        /* register with the generic lantiq layer */
        ret = ltq_pinctrl_register(pdev, &xway_info);
        if (ret) {
-               gpiochip_remove(&xway_chip);
                dev_err(&pdev->dev, "Failed to register pinctrl driver\n");
                return ret;
        }