iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: Intel: bytcr_rt5651: switch to using devm_fwnode_gpiod_get()

Browse Source 
devm_fwnode_get_index_gpiod_from_child() is going away as the name is
too unwieldy, let's switch to using the new devm_fwnode_gpiod_get().

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Link: https://lore.kernel.org/r/20200103011754.GA260926@dtor-ws
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Dmitry Torokhov 2020-01-02 17:17:54 -08:00 committed by Mark Brown
parent c1b34230a3
commit e26c4e900b
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sound/soc/intel/boards/bytcr_rt5651.c
View File

@ -990,10 +990,11 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev)
if (byt_rt5651_gpios) { if (byt_rt5651_gpios) {
devm_acpi_dev_add_driver_gpios(codec_dev, byt_rt5651_gpios); devm_acpi_dev_add_driver_gpios(codec_dev, byt_rt5651_gpios);
priv->ext_amp_gpio = devm_fwnode_get_index_gpiod_from_child( priv->ext_amp_gpio = devm_fwnode_gpiod_get(&pdev->dev,
&pdev->dev, "ext-amp-enable", 0, codec_dev->fwnode,
codec_dev->fwnode, "ext-amp-enable",
GPIOD_OUT_LOW, "speaker-amp"); GPIOD_OUT_LOW,
"speaker-amp");
if (IS_ERR(priv->ext_amp_gpio)) { if (IS_ERR(priv->ext_amp_gpio)) {
ret_val = PTR_ERR(priv->ext_amp_gpio); ret_val = PTR_ERR(priv->ext_amp_gpio);
switch (ret_val) { switch (ret_val) {
@ -1009,10 +1010,11 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev)
return ret_val; return ret_val;
} }
} }
priv->hp_detect = devm_fwnode_get_index_gpiod_from_child( priv->hp_detect = devm_fwnode_gpiod_get(&pdev->dev,
&pdev->dev, "hp-detect", 0, codec_dev->fwnode,
codec_dev->fwnode, "hp-detect",
GPIOD_IN, "hp-detect"); GPIOD_IN,
"hp-detect");
if (IS_ERR(priv->hp_detect)) { if (IS_ERR(priv->hp_detect)) {
ret_val = PTR_ERR(priv->hp_detect); ret_val = PTR_ERR(priv->hp_detect);
switch (ret_val) { switch (ret_val) {