diff options
| author | Andy Shevchenko <[email protected]> | 2021-10-07 19:45:22 +0300 |
|---|---|---|
| committer | Mark Brown <[email protected]> | 2021-10-08 13:51:13 +0100 |
| commit | 4e03b1b772ba33ea72e40918819b5e65a30a6eb6 (patch) | |
| tree | 4dfc58687cf56b1d80304e97f8ced3055c5162b0 | |
| parent | e8ccf82b8a573c543a5356f503cf2edb66cccb6f (diff) | |
ASoC: Intel: bytcht_es8316: Switch to use gpiod_get_optional()
First of all, replace indexed API by plain one since we have index 0.
Second, switch to optional variant and drop duplicated code.
Signed-off-by: Andy Shevchenko <[email protected]>
Acked-by: Pierre-Louis Bossart <[email protected]>
Message-Id: <[email protected]>
Signed-off-by: Mark Brown <[email protected]>
| -rw-r--r-- | sound/soc/intel/boards/bytcht_es8316.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/sound/soc/intel/boards/bytcht_es8316.c b/sound/soc/intel/boards/bytcht_es8316.c index 171f3d8c5996..d8dcf63825a6 100644 --- a/sound/soc/intel/boards/bytcht_es8316.c +++ b/sound/soc/intel/boards/bytcht_es8316.c @@ -566,16 +566,12 @@ static int snd_byt_cht_es8316_mc_probe(struct platform_device *pdev) devm_acpi_dev_add_driver_gpios(codec_dev, byt_cht_es8316_gpios); priv->speaker_en_gpio = - gpiod_get_index(codec_dev, "speaker-enable", 0, - /* see comment in byt_cht_es8316_resume */ - GPIOD_OUT_LOW | GPIOD_FLAGS_BIT_NONEXCLUSIVE); - + gpiod_get_optional(codec_dev, "speaker-enable", + /* see comment in byt_cht_es8316_resume() */ + GPIOD_OUT_LOW | GPIOD_FLAGS_BIT_NONEXCLUSIVE); if (IS_ERR(priv->speaker_en_gpio)) { ret = PTR_ERR(priv->speaker_en_gpio); switch (ret) { - case -ENOENT: - priv->speaker_en_gpio = NULL; - break; default: dev_err(dev, "get speaker GPIO failed: %d\n", ret); fallthrough; |