mirror of
https://github.com/torvalds/linux.git
synced 2024-12-20 18:11:47 +00:00
[media] media: adv7604: improve usage of gpiod API
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 devm_gpiod_get_index_optional instead of
devm_gpiod_get_index with ignoring all errors.
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:
parent
48ab45adcc
commit
269bd1324f
@ -538,12 +538,8 @@ static void adv76xx_set_hpd(struct adv76xx_state *state, unsigned int hpd)
|
|||||||
{
|
{
|
||||||
unsigned int i;
|
unsigned int i;
|
||||||
|
|
||||||
for (i = 0; i < state->info->num_dv_ports; ++i) {
|
for (i = 0; i < state->info->num_dv_ports; ++i)
|
||||||
if (IS_ERR(state->hpd_gpio[i]))
|
|
||||||
continue;
|
|
||||||
|
|
||||||
gpiod_set_value_cansleep(state->hpd_gpio[i], hpd & BIT(i));
|
gpiod_set_value_cansleep(state->hpd_gpio[i], hpd & BIT(i));
|
||||||
}
|
|
||||||
|
|
||||||
v4l2_subdev_notify(&state->sd, ADV76XX_HOTPLUG, &hpd);
|
v4l2_subdev_notify(&state->sd, ADV76XX_HOTPLUG, &hpd);
|
||||||
}
|
}
|
||||||
@ -2729,12 +2725,12 @@ static int adv76xx_probe(struct i2c_client *client,
|
|||||||
/* Request GPIOs. */
|
/* Request GPIOs. */
|
||||||
for (i = 0; i < state->info->num_dv_ports; ++i) {
|
for (i = 0; i < state->info->num_dv_ports; ++i) {
|
||||||
state->hpd_gpio[i] =
|
state->hpd_gpio[i] =
|
||||||
devm_gpiod_get_index(&client->dev, "hpd", i);
|
devm_gpiod_get_index_optional(&client->dev, "hpd", i,
|
||||||
|
GPIOD_OUT_LOW);
|
||||||
if (IS_ERR(state->hpd_gpio[i]))
|
if (IS_ERR(state->hpd_gpio[i]))
|
||||||
continue;
|
return PTR_ERR(state->hpd_gpio[i]);
|
||||||
|
|
||||||
gpiod_direction_output(state->hpd_gpio[i], 0);
|
|
||||||
|
|
||||||
|
if (state->hpd_gpio[i])
|
||||||
v4l_info(client, "Handling HPD %u GPIO\n", i);
|
v4l_info(client, "Handling HPD %u GPIO\n", i);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user