]> Pileus Git - ~andy/linux/commitdiff
regulator: wm8994: Convert to gpio_request_one()
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 7 May 2012 17:18:45 +0000 (18:18 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 7 May 2012 17:23:44 +0000 (18:23 +0100)
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
drivers/regulator/wm8994-regulator.c

index 0ee81e1b64638f01a63ff685ec7fa5f639b01b66..1f7f43cfc2d12d413937286460e16c48cad6b374 100644 (file)
@@ -224,19 +224,12 @@ static __devinit int wm8994_ldo_probe(struct platform_device *pdev)
        if (pdata->ldo[id].enable && gpio_is_valid(pdata->ldo[id].enable)) {
                ldo->enable = pdata->ldo[id].enable;
 
-               ret = gpio_request(ldo->enable, "WM8994 LDO enable");
+               ret = gpio_request_one(ldo->enable, 0, "WM8994 LDO enable");
                if (ret < 0) {
                        dev_err(&pdev->dev, "Failed to get enable GPIO: %d\n",
                                ret);
                        goto err;
                }
-
-               ret = gpio_direction_output(ldo->enable, ldo->is_enabled);
-               if (ret < 0) {
-                       dev_err(&pdev->dev, "Failed to set GPIO up: %d\n",
-                               ret);
-                       goto err_gpio;
-               }
        } else
                ldo->is_enabled = true;