Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1552823

[PATCH 1/4] mfd: arizona: Remove duplicate set of ret variable

Show all headers | View raw

arizona_poll_reg already returns ETIMEDOUT if we don't see the expected
register changes before the time out, so remove pointless local setting of
ETIMEDOUT.

Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
---
 drivers/mfd/arizona-core.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
index b6d4bc6..e00f577 100644
--- a/drivers/mfd/arizona-core.c
+++ b/drivers/mfd/arizona-core.c
@@ -342,10 +342,8 @@ static int arizona_enable_freerun_sysclk(struct arizona *arizona,
 	ret = arizona_poll_reg(arizona, 25, ARIZONA_INTERRUPT_RAW_STATUS_5,
 			       ARIZONA_FLL1_CLOCK_OK_STS,
 			       ARIZONA_FLL1_CLOCK_OK_STS);
-	if (ret) {
-		ret = -ETIMEDOUT;
+	if (ret)
 		goto err_fll;
-	}
 
 	ret = regmap_write(arizona->regmap, ARIZONA_SYSTEM_CLOCK_1, 0x0144);
 	if (ret) {
@@ -407,11 +405,9 @@ static int wm5102_apply_hardware_patch(struct arizona *arizona)
 
 	ret = arizona_poll_reg(arizona, 5, ARIZONA_WRITE_SEQUENCER_CTRL_1,
 			       ARIZONA_WSEQ_BUSY, 0);
-	if (ret) {
+	if (ret)
 		regmap_write(arizona->regmap, ARIZONA_WRITE_SEQUENCER_CTRL_0,
 			     ARIZONA_WSEQ_ABORT);
-		ret = -ETIMEDOUT;
-	}
 
 err:
 	err = arizona_disable_freerun_sysclk(arizona, &state);
-- 
2.1.4

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH 1/4] mfd: arizona: Remove duplicate set of ret variable Charles Keepax <ckeepax@opensource.wolfsonmicro.com> - 2017-01-06 15:20 +0100
  [PATCH v2 4/4] mfd: arizona: Use regmap_read_poll_timeout instead of hard coding it Charles Keepax <ckeepax@opensource.wolfsonmicro.com> - 2017-01-06 15:20 +0100
  [PATCH 3/4] mfd: arizona: Update arizona_poll_reg to take a timeout in milliseconds Charles Keepax <ckeepax@opensource.wolfsonmicro.com> - 2017-01-06 15:20 +0100
    Re: [PATCH 3/4] mfd: arizona: Update arizona_poll_reg to take a  timeout in milliseconds Charles Keepax <ckeepax@opensource.wolfsonmicro.com> - 2017-01-06 15:30 +0100

csiph-web