ASoC: rt5665: Use devm_gpio_request_one()

AxelLin · broonie · commit f2826c1fe5d0 · 2016-11-16T16:27:29.000Z
Simplify the code a bit.

Signed-off-by: Axel Lin &lt;axel.lin@ingics.com&gt;
Signed-off-by: Mark Brown &lt;broonie@kernel.org&gt;
diff --git a/sound/soc/codecs/rt5665.c b/sound/soc/codecs/rt5665.c
@@ -4677,11 +4677,9 @@ static int rt5665_i2c_probe(struct i2c_client *i2c,
 	}
 
 	if (gpio_is_valid(rt5665->pdata.ldo1_en)) {
-		if (devm_gpio_request(&i2c->dev, rt5665->pdata.ldo1_en,
-			"rt5665"))
+		if (devm_gpio_request_one(&i2c->dev, rt5665->pdata.ldo1_en,
+					  GPIOF_OUT_INIT_HIGH, "rt5665"))
 			dev_err(&i2c->dev, "Fail gpio_request gpio_ldo\n");
-		else if (gpio_direction_output(rt5665->pdata.ldo1_en, 1))
-			dev_err(&i2c->dev, "Fail gpio_direction gpio_ldo\n");
 	}
 
 	/* Sleep for 300 ms miniumum */

Original file line number	Diff line number	Diff line change
`@@ -4677,11 +4677,9 @@ static int rt5665_i2c_probe(struct i2c_client *i2c,`
`4677`	`4677`	`}`
`4678`	`4678`
`4679`	`4679`	`if (gpio_is_valid(rt5665->pdata.ldo1_en)) {`
`4680`		`- if (devm_gpio_request(&i2c->dev, rt5665->pdata.ldo1_en,`
`4681`		`- "rt5665"))`
	`4680`	`+ if (devm_gpio_request_one(&i2c->dev, rt5665->pdata.ldo1_en,`
	`4681`	`+ GPIOF_OUT_INIT_HIGH, "rt5665"))`
`4682`	`4682`	`dev_err(&i2c->dev, "Fail gpio_request gpio_ldo\n");`
`4683`		`- else if (gpio_direction_output(rt5665->pdata.ldo1_en, 1))`
`4684`		`- dev_err(&i2c->dev, "Fail gpio_direction gpio_ldo\n");`
`4685`	`4683`	`}`
`4686`	`4684`
`4687`	`4685`	`/* Sleep for 300 ms miniumum */`