Merge tag 'pinctrl-v4.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

[mirror_ubuntu-artful-kernel.git] / drivers / pinctrl / intel / pinctrl-baytrail.c

diff --git a/drivers/pinctrl/intel/pinctrl-baytrail.c b/drivers/pinctrl/intel/pinctrl-baytrail.c
index d94aef17348b4b88f3952670886b863b952cfc60..fa3c5758ac6739f3fe07df34bc29fb13cfab21af 100644 (file)
--- a/drivers/pinctrl/intel/pinctrl-baytrail.c
+++ b/drivers/pinctrl/intel/pinctrl-baytrail.c
@@ -1466,7 +1466,7 @@ static void byt_gpio_dbg_show(struct seq_file *s, struct gpio_chip *chip)
                           val & BYT_INPUT_EN ? "  " : "in",
                           val & BYT_OUTPUT_EN ? "   " : "out",
                           val & BYT_LEVEL ? "hi" : "lo",
-                          comm->pad_map[i], comm->pad_map[i] * 32,
+                          comm->pad_map[i], comm->pad_map[i] * 16,
                           conf0 & 0x7,
                           conf0 & BYT_TRIG_NEG ? " fall" : "     ",
                           conf0 & BYT_TRIG_POS ? " rise" : "     ",
@@ -1709,7 +1709,7 @@ static int byt_gpio_probe(struct byt_gpio *vg)
        vg->saved_context = devm_kcalloc(&vg->pdev->dev, gc->ngpio,
                                       sizeof(*vg->saved_context), GFP_KERNEL);
 #endif
-       ret = gpiochip_add_data(gc, vg);
+       ret = devm_gpiochip_add_data(&vg->pdev->dev, gc, vg);
        if (ret) {
                dev_err(&vg->pdev->dev, "failed adding byt-gpio chip\n");
                return ret;
@@ -1719,7 +1719,7 @@ static int byt_gpio_probe(struct byt_gpio *vg)
                                     0, 0, vg->soc_data->npins);
        if (ret) {
                dev_err(&vg->pdev->dev, "failed to add GPIO pin range\n");
-               goto fail;
+               return ret;
        }
 
        /* set up interrupts  */
@@ -1730,7 +1730,7 @@ static int byt_gpio_probe(struct byt_gpio *vg)
                                           handle_bad_irq, IRQ_TYPE_NONE);
                if (ret) {
                        dev_err(&vg->pdev->dev, "failed to add irqchip\n");
-                       goto fail;
+                       return ret;
                }
 
                gpiochip_set_chained_irqchip(gc, &byt_irqchip,
@@ -1738,11 +1738,6 @@ static int byt_gpio_probe(struct byt_gpio *vg)
                                             byt_gpio_irq_handler);
        }
 
-       return ret;
-
-fail:
-       gpiochip_remove(&vg->chip);
-
        return ret;
 }
 
@@ -1826,7 +1821,7 @@ static int byt_pinctrl_probe(struct platform_device *pdev)
        vg->pctl_desc.pins      = vg->soc_data->pins;
        vg->pctl_desc.npins     = vg->soc_data->npins;
 
-       vg->pctl_dev = pinctrl_register(&vg->pctl_desc, &pdev->dev, vg);
+       vg->pctl_dev = devm_pinctrl_register(&pdev->dev, &vg->pctl_desc, vg);
        if (IS_ERR(vg->pctl_dev)) {
                dev_err(&pdev->dev, "failed to register pinctrl driver\n");
                return PTR_ERR(vg->pctl_dev);
@@ -1835,10 +1830,8 @@ static int byt_pinctrl_probe(struct platform_device *pdev)
        raw_spin_lock_init(&vg->lock);
 
        ret = byt_gpio_probe(vg);
-       if (ret) {
-               pinctrl_unregister(vg->pctl_dev);
+       if (ret)
                return ret;
-       }
 
        platform_set_drvdata(pdev, vg);
        pm_runtime_enable(&pdev->dev);