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

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>

diff --git a/sound/soc/intel/boards/bytcr_rt5651.c b/sound/soc/intel/boards/bytcr_rt5651.c
index 3bb2732..6d71352 100644 (file)
--- a/sound/soc/intel/boards/bytcr_rt5651.c
+++ b/sound/soc/intel/boards/bytcr_rt5651.c
@@ -990,10 +990,11 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev)
 
        if (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(
-                                               &pdev->dev, "ext-amp-enable", 0,
-                                               codec_dev->fwnode,
-                                               GPIOD_OUT_LOW, "speaker-amp");
+               priv->ext_amp_gpio = devm_fwnode_gpiod_get(&pdev->dev,
+                                                          codec_dev->fwnode,
+                                                          "ext-amp-enable",
+                                                          GPIOD_OUT_LOW,
+                                                          "speaker-amp");
                if (IS_ERR(priv->ext_amp_gpio)) {
                        ret_val = PTR_ERR(priv->ext_amp_gpio);
                        switch (ret_val) {
@@ -1009,10 +1010,11 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev)
                                return ret_val;
                        }
                }
-               priv->hp_detect = devm_fwnode_get_index_gpiod_from_child(
-                                               &pdev->dev, "hp-detect", 0,
-                                               codec_dev->fwnode,
-                                               GPIOD_IN, "hp-detect");
+               priv->hp_detect = devm_fwnode_gpiod_get(&pdev->dev,
+                                                       codec_dev->fwnode,
+                                                       "hp-detect",
+                                                       GPIOD_IN,
+                                                       "hp-detect");
                if (IS_ERR(priv->hp_detect)) {
                        ret_val = PTR_ERR(priv->hp_detect);
                        switch (ret_val) {