From b44e4551b11908f4d109745ba41aa44a56c0bd17 Mon Sep 17 00:00:00 2001 From: Karthikeyan Mani Date: Mon, 9 Sep 2019 23:06:04 -0700 Subject: [PATCH] asoc: codecs: bolero: Do not return error for unused gpio If soundwire gpio is not used, then no need to return error if not able to get gpio data. Change-Id: I97705b49d3b01f99b7a4e91190a15ffb211d32f2 Signed-off-by: Karthikeyan Mani --- asoc/codecs/bolero/rx-macro.c | 3 ++- asoc/codecs/bolero/tx-macro.c | 3 ++- asoc/codecs/bolero/wsa-macro.c | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/asoc/codecs/bolero/rx-macro.c b/asoc/codecs/bolero/rx-macro.c index 52598ef704a6..cc80adfe8bba 100644 --- a/asoc/codecs/bolero/rx-macro.c +++ b/asoc/codecs/bolero/rx-macro.c @@ -3763,7 +3763,8 @@ static int rx_macro_probe(struct platform_device *pdev) __func__); return -EINVAL; } - if (msm_cdc_pinctrl_get_state(rx_priv->rx_swr_gpio_p) < 0) { + if (msm_cdc_pinctrl_get_state(rx_priv->rx_swr_gpio_p) < 0 && + is_used_rx_swr_gpio) { dev_err(&pdev->dev, "%s: failed to get swr pin state\n", __func__); return -EPROBE_DEFER; diff --git a/asoc/codecs/bolero/tx-macro.c b/asoc/codecs/bolero/tx-macro.c index 8c32043c479e..ba93c5ed53eb 100644 --- a/asoc/codecs/bolero/tx-macro.c +++ b/asoc/codecs/bolero/tx-macro.c @@ -2299,7 +2299,8 @@ static int tx_macro_probe(struct platform_device *pdev) __func__); return -EINVAL; } - if (msm_cdc_pinctrl_get_state(tx_priv->tx_swr_gpio_p) < 0) { + if (msm_cdc_pinctrl_get_state(tx_priv->tx_swr_gpio_p) < 0 && + is_used_tx_swr_gpio) { dev_err(&pdev->dev, "%s: failed to get swr pin state\n", __func__); return -EPROBE_DEFER; diff --git a/asoc/codecs/bolero/wsa-macro.c b/asoc/codecs/bolero/wsa-macro.c index dd12ad237362..a1dcdda41e08 100644 --- a/asoc/codecs/bolero/wsa-macro.c +++ b/asoc/codecs/bolero/wsa-macro.c @@ -2957,7 +2957,8 @@ static int wsa_macro_probe(struct platform_device *pdev) __func__); return -EINVAL; } - if (msm_cdc_pinctrl_get_state(wsa_priv->wsa_swr_gpio_p) < 0) { + if (msm_cdc_pinctrl_get_state(wsa_priv->wsa_swr_gpio_p) < 0 && + is_used_wsa_swr_gpio) { dev_err(&pdev->dev, "%s: failed to get swr pin state\n", __func__); return -EPROBE_DEFER;