aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2011-11-30 20:55:07 -0500
committerSamuel Ortiz <sameo@linux.intel.com>2012-01-08 18:37:38 -0500
commitb04edb934966b824b5d61edab76f257c10e31299 (patch)
tree38ab6c9d65b5d3284783c48f88c3128fde9ab410
parent4e9daaca8d265151789c78a695ffdc774d2af850 (diff)
mfd: Use gpio_request_one from twl6040-core
Use gpio_request_one() instead of multiple gpiolib calls. Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
-rw-r--r--drivers/mfd/twl6040-core.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/mfd/twl6040-core.c b/drivers/mfd/twl6040-core.c
index 7f06685187f..dda86293dc9 100644
--- a/drivers/mfd/twl6040-core.c
+++ b/drivers/mfd/twl6040-core.c
@@ -509,13 +509,10 @@ static int __devinit twl6040_probe(struct platform_device *pdev)
509 twl6040->audpwron = -EINVAL; 509 twl6040->audpwron = -EINVAL;
510 510
511 if (gpio_is_valid(twl6040->audpwron)) { 511 if (gpio_is_valid(twl6040->audpwron)) {
512 ret = gpio_request(twl6040->audpwron, "audpwron"); 512 ret = gpio_request_one(twl6040->audpwron, GPIOF_OUT_INIT_LOW,
513 "audpwron");
513 if (ret) 514 if (ret)
514 goto gpio1_err; 515 goto gpio1_err;
515
516 ret = gpio_direction_output(twl6040->audpwron, 0);
517 if (ret)
518 goto gpio2_err;
519 } 516 }
520 517
521 /* codec interrupt */ 518 /* codec interrupt */