From 09e3fd202df67ec5d6d9a04c05b58c7367580226 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Mon, 7 May 2012 18:18:45 +0100 Subject: regulator: wm8994: Convert to gpio_request_one() Signed-off-by: Mark Brown --- drivers/regulator/wm8994-regulator.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'drivers/regulator/wm8994-regulator.c') diff --git a/drivers/regulator/wm8994-regulator.c b/drivers/regulator/wm8994-regulator.c index 0ee81e1b6463..1f7f43cfc2d1 100644 --- a/drivers/regulator/wm8994-regulator.c +++ b/drivers/regulator/wm8994-regulator.c @@ -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; -- cgit v1.2.3 From 5d0526eade515d29769c46bc522055fa17cc536e Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Tue, 8 May 2012 17:45:31 +0100 Subject: regulator: wm8994: Use main I2C device as struct device This makes logging a bit clearer as it gives the actual bus location and makes things like board hookup a bit smoother. Signed-off-by: Mark Brown --- drivers/regulator/wm8994-regulator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/regulator/wm8994-regulator.c') diff --git a/drivers/regulator/wm8994-regulator.c b/drivers/regulator/wm8994-regulator.c index 1f7f43cfc2d1..f2912f1528cc 100644 --- a/drivers/regulator/wm8994-regulator.c +++ b/drivers/regulator/wm8994-regulator.c @@ -233,7 +233,7 @@ static __devinit int wm8994_ldo_probe(struct platform_device *pdev) } else ldo->is_enabled = true; - config.dev = &pdev->dev; + config.dev = wm8994->dev; config.init_data = pdata->ldo[id].init_data; config.driver_data = ldo; -- cgit v1.2.3