[PATCH 3/3] ASoC: samsung: Use gpio_is_valid()

From: Arvind Yadav
Date: Fri Apr 27 2018 - 04:56:43 EST


Replace the manual validity checks for the GPIO with the
gpio_is_valid().

Signed-off-by: Arvind Yadav <arvind.yadav.cs@xxxxxxxxx>
---
sound/soc/samsung/s3c24xx_simtec.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/sound/soc/samsung/s3c24xx_simtec.c b/sound/soc/samsung/s3c24xx_simtec.c
index 6de63f3..23e8ef9d 100644
--- a/sound/soc/samsung/s3c24xx_simtec.c
+++ b/sound/soc/samsung/s3c24xx_simtec.c
@@ -229,7 +229,7 @@ static int attach_gpio_amp(struct device *dev,
int ret;

/* attach gpio amp gain (if any) */
- if (pdata->amp_gain[0] > 0) {
+ if (gpio_is_valid(pdata->amp_gain[0])) {
ret = gpio_request(pd->amp_gain[0], "gpio-amp-gain0");
if (ret) {
dev_err(dev, "cannot get amp gpio gain0\n");
@@ -248,7 +248,7 @@ static int attach_gpio_amp(struct device *dev,
}

/* note, currently we assume GPA0 isn't valid amp */
- if (pdata->amp_gpio > 0) {
+ if (gpio_is_valid(pdata->amp_gpio)) {
ret = gpio_request(pd->amp_gpio, "gpio-amp");
if (ret) {
dev_err(dev, "cannot get amp gpio %d (%d)\n",
@@ -263,7 +263,7 @@ static int attach_gpio_amp(struct device *dev,
return 0;

err_amp:
- if (pd->amp_gain[0] > 0) {
+ if (gpio_is_valid(pd->amp_gain[0])) {
gpio_free(pd->amp_gain[0]);
gpio_free(pd->amp_gain[1]);
}
@@ -273,12 +273,12 @@ static int attach_gpio_amp(struct device *dev,

static void detach_gpio_amp(struct s3c24xx_audio_simtec_pdata *pd)
{
- if (pd->amp_gain[0] > 0) {
+ if (gpio_is_valid(pd->amp_gain[0])) {
gpio_free(pd->amp_gain[0]);
gpio_free(pd->amp_gain[1]);
}

- if (pd->amp_gpio > 0)
+ if (gpio_is_valid(pd->amp_gpio))
gpio_free(pd->amp_gpio);
}

--
1.9.1