redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

[media] media: radio-si4713: improve usage of gpiod API

Browse source 
Since 39b2bbe3d7 (gpio: add flags argument to gpiod_get*() functions)
which appeared in v3.17-rc1, the gpiod_get* functions take an additional
parameter that allows to specify direction and initial value for output.
Simplify accordingly.

Moreover use the _optional variant which has tighter error checking, but
is simpler to use which allows further simplification.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Uwe Kleine-König 2015-03-26 17:47:53 -03:00 committed by Mauro Carvalho Chehab
parent 4a20334959
commit b36ae8532f
1 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
drivers/media/radio/si4713/si4713.c
View file

@ -383,7 +383,7 @@ static int si4713_powerup(struct si4713_device *sdev)
} }
} }
if (!IS_ERR(sdev->gpio_reset)) { if (sdev->gpio_reset) {
udelay(50); udelay(50);
gpiod_set_value(sdev->gpio_reset, 1); gpiod_set_value(sdev->gpio_reset, 1);
} }
@ -407,8 +407,7 @@ static int si4713_powerup(struct si4713_device *sdev)
SI4713_STC_INT | SI4713_CTS); SI4713_STC_INT | SI4713_CTS);
return err; return err;
} }
if (!IS_ERR(sdev->gpio_reset)) gpiod_set_value(sdev->gpio_reset, 0);
gpiod_set_value(sdev->gpio_reset, 0);
if (sdev->vdd) { if (sdev->vdd) {
@ -447,7 +446,7 @@ static int si4713_powerdown(struct si4713_device *sdev)
v4l2_dbg(1, debug, &sdev->sd, "Power down response: 0x%02x\n", v4l2_dbg(1, debug, &sdev->sd, "Power down response: 0x%02x\n",
resp[0]); resp[0]);
v4l2_dbg(1, debug, &sdev->sd, "Device in reset mode\n"); v4l2_dbg(1, debug, &sdev->sd, "Device in reset mode\n");
if (!IS_ERR(sdev->gpio_reset)) if (sdev->gpio_reset)
gpiod_set_value(sdev->gpio_reset, 0); gpiod_set_value(sdev->gpio_reset, 0);
if (sdev->vdd) { if (sdev->vdd) {
@ -1460,14 +1459,9 @@ static int si4713_probe(struct i2c_client *client,
goto exit; goto exit;
} }
sdev->gpio_reset = devm_gpiod_get(&client->dev, "reset"); sdev->gpio_reset = devm_gpiod_get_optional(&client->dev, "reset",
if (!IS_ERR(sdev->gpio_reset)) { GPIOD_OUT_LOW);
gpiod_direction_output(sdev->gpio_reset, 0); if (IS_ERR(sdev->gpio_reset)) {
} else if (PTR_ERR(sdev->gpio_reset) == -ENOENT) {
dev_dbg(&client->dev, "No reset GPIO assigned\n");
} else if (PTR_ERR(sdev->gpio_reset) == -ENOSYS) {
dev_dbg(&client->dev, "No reset GPIO support\n");
} else {
rval = PTR_ERR(sdev->gpio_reset); rval = PTR_ERR(sdev->gpio_reset);
dev_err(&client->dev, "Failed to request gpio: %d\n", rval); dev_err(&client->dev, "Failed to request gpio: %d\n", rval);
goto exit; goto exit;