From bbac3a78d36be32b0f8c00758786cd6c7000f669 Mon Sep 17 00:00:00 2001 From: Peter Ujfalusi Date: Thu, 11 Oct 2012 13:55:29 +0200 Subject: [PATCH] --- yaml --- r: 344961 b: refs/heads/master c: eae9a9c85b106163b293bf8b0fec44943e98677c h: refs/heads/master i: 344959: 800b5bb8041493ac3a58baeb711b5846cce737d8 v: v3 --- [refs] | 2 +- trunk/drivers/mfd/twl6040-core.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 12a336ab46c8..ee0ea6a85e80 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a32415202f709f39a059f776da28248c499e0bb5 +refs/heads/master: eae9a9c85b106163b293bf8b0fec44943e98677c diff --git a/trunk/drivers/mfd/twl6040-core.c b/trunk/drivers/mfd/twl6040-core.c index b220aa241911..a46d987b9c8b 100644 --- a/trunk/drivers/mfd/twl6040-core.c +++ b/trunk/drivers/mfd/twl6040-core.c @@ -218,8 +218,7 @@ static irqreturn_t twl6040_naudint_handler(int irq, void *data) return IRQ_HANDLED; } -static int twl6040_power_up_completion(struct twl6040 *twl6040, - int naudint) +static int twl6040_power_up_completion(struct twl6040 *twl6040) { int time_left; u8 intid; @@ -241,7 +240,6 @@ static int twl6040_power_up_completion(struct twl6040 *twl6040, int twl6040_power(struct twl6040 *twl6040, int on) { int audpwron = twl6040->audpwron; - int naudint = twl6040->irq; int ret = 0; mutex_lock(&twl6040->mutex); @@ -255,7 +253,7 @@ int twl6040_power(struct twl6040 *twl6040, int on) /* use AUDPWRON line */ gpio_set_value(audpwron, 1); /* wait for power-up completion */ - ret = twl6040_power_up_completion(twl6040, naudint); + ret = twl6040_power_up_completion(twl6040); if (ret) { dev_err(twl6040->dev, "automatic power-up failed\n");