From: Tzung-Bi Shih <tzungbi@google.com>
To: broonie@kernel.org, robh+dt@kernel.org
Cc: tzungbi@google.com, alsa-devel@alsa-project.org,
devicetree@vger.kernel.org
Subject: [PATCH 2/5] ASoC: mediatek: mt8192-mt6359: simplify mt8192_rt5682_init
Date: Wed, 20 Jan 2021 16:08:47 +0800 [thread overview]
Message-ID: <20210120080850.699354-3-tzungbi@google.com> (raw)
In-Reply-To: <20210120080850.699354-1-tzungbi@google.com>
Returns snd_soc_component_set_jack() directly in mt8192_rt5682_init.
No need to have another block to check the return value.
Signed-off-by: Tzung-Bi Shih <tzungbi@google.com>
---
sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c b/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c
index 72d337fc8534..8ea24b32a535 100644
--- a/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c
+++ b/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c
@@ -326,13 +326,7 @@ static int mt8192_rt5682_init(struct snd_soc_pcm_runtime *rtd)
snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEUP);
snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOLUMEDOWN);
- ret = snd_soc_component_set_jack(cmpnt_codec, jack, NULL);
- if (ret) {
- dev_err(rtd->dev, "Headset Jack set failed: %d\n", ret);
- return ret;
- }
-
- return 0;
+ return snd_soc_component_set_jack(cmpnt_codec, jack, NULL);
};
static int mt8192_i2s_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
--
2.30.0.284.gd98b1dd5eaa7-goog
next prev parent reply other threads:[~2021-01-20 8:11 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-20 8:08 [PATCH 0/5] ASoC: mediatek: mt8192-mt6359: support DP audio Tzung-Bi Shih
2021-01-20 8:08 ` [PATCH 1/5] ASoC: mediatek: mt8192-mt6359: move headset_jack to card specific data Tzung-Bi Shih
2021-01-20 8:08 ` Tzung-Bi Shih [this message]
2021-01-20 8:08 ` [PATCH 3/5] ASoC: mediatek: mt8192: change mclk_multiple of TDM from 128 to 512 Tzung-Bi Shih
2021-01-20 8:08 ` [PATCH 4/5] ASoC: dt-bindings: mt8192-mt6359: add hdmi-codec property Tzung-Bi Shih
2021-01-20 8:08 ` [PATCH 5/5] ASoC: mediatek: mt8192-mt6359: support audio over DP Tzung-Bi Shih
2021-01-21 0:05 ` [PATCH 0/5] ASoC: mediatek: mt8192-mt6359: support DP audio Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210120080850.699354-3-tzungbi@google.com \
--to=tzungbi@google.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=robh+dt@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).