* [PATCH v3 1/3] ASoC: mediatek: mt8192-mt6359: use asoc_substream_to_rtd()
2021-02-03 3:21 [PATCH v3 0/3] ASoC: mediatek: mt8192: apply some cleanup Tzung-Bi Shih
@ 2021-02-03 3:21 ` Tzung-Bi Shih
2021-02-03 3:22 ` [PATCH v3 2/3] ASoC: mediatek: mt8192: " Tzung-Bi Shih
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Tzung-Bi Shih @ 2021-02-03 3:21 UTC (permalink / raw)
To: broonie; +Cc: tzungbi, alsa-devel
Uses asoc_substream_to_rtd() helper.
Signed-off-by: Tzung-Bi Shih <tzungbi@google.com>
---
sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c b/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c
index c368236d8a3a..d2ebf3b6e359 100644
--- a/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c
+++ b/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c
@@ -39,7 +39,7 @@ struct mt8192_mt6359_priv {
static int mt8192_rt1015_i2s_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params)
{
- struct snd_soc_pcm_runtime *rtd = substream->private_data;
+ struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
struct snd_soc_card *card = rtd->card;
struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);
struct snd_soc_dai *codec_dai;
@@ -74,7 +74,7 @@ static int mt8192_rt1015_i2s_hw_params(struct snd_pcm_substream *substream,
static int mt8192_rt5682_i2s_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params)
{
- struct snd_soc_pcm_runtime *rtd = substream->private_data;
+ struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
struct snd_soc_card *card = rtd->card;
struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);
struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);
@@ -362,7 +362,7 @@ static int mt8192_i2s_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
static int
mt8192_mt6359_rt1015_rt5682_cap1_startup(struct snd_pcm_substream *substream)
{
- struct snd_soc_pcm_runtime *rtd = substream->private_data;
+ struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
struct snd_soc_component *component =
snd_soc_rtdcom_lookup(rtd, AFE_PCM_NAME);
struct mtk_base_afe *afe = snd_soc_component_get_drvdata(component);
--
2.30.0.365.g02bc693789-goog
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH v3 2/3] ASoC: mediatek: mt8192: use asoc_substream_to_rtd()
2021-02-03 3:21 [PATCH v3 0/3] ASoC: mediatek: mt8192: apply some cleanup Tzung-Bi Shih
2021-02-03 3:21 ` [PATCH v3 1/3] ASoC: mediatek: mt8192-mt6359: use asoc_substream_to_rtd() Tzung-Bi Shih
@ 2021-02-03 3:22 ` Tzung-Bi Shih
2021-02-03 3:22 ` [PATCH v3 3/3] ASoC: mediatek: mt8192-mt6359: simplify ops for Capture1 DAI link Tzung-Bi Shih
2021-02-04 19:53 ` [PATCH v3 0/3] ASoC: mediatek: mt8192: apply some cleanup Mark Brown
3 siblings, 0 replies; 5+ messages in thread
From: Tzung-Bi Shih @ 2021-02-03 3:22 UTC (permalink / raw)
To: broonie; +Cc: tzungbi, alsa-devel
Uses asoc_substream_to_rtd() helper.
Signed-off-by: Tzung-Bi Shih <tzungbi@google.com>
---
sound/soc/mediatek/mt8192/mt8192-afe-pcm.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/soc/mediatek/mt8192/mt8192-afe-pcm.c b/sound/soc/mediatek/mt8192/mt8192-afe-pcm.c
index e7fec2d75e3d..7a1724f5ff4c 100644
--- a/sound/soc/mediatek/mt8192/mt8192-afe-pcm.c
+++ b/sound/soc/mediatek/mt8192/mt8192-afe-pcm.c
@@ -42,7 +42,7 @@ static const struct snd_pcm_hardware mt8192_afe_hardware = {
static int mt8192_memif_fs(struct snd_pcm_substream *substream,
unsigned int rate)
{
- struct snd_soc_pcm_runtime *rtd = substream->private_data;
+ struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
struct snd_soc_component *component =
snd_soc_rtdcom_lookup(rtd, AFE_PCM_NAME);
struct mtk_base_afe *afe = snd_soc_component_get_drvdata(component);
@@ -59,7 +59,7 @@ static int mt8192_get_dai_fs(struct mtk_base_afe *afe,
static int mt8192_irq_fs(struct snd_pcm_substream *substream, unsigned int rate)
{
- struct snd_soc_pcm_runtime *rtd = substream->private_data;
+ struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
struct snd_soc_component *component =
snd_soc_rtdcom_lookup(rtd, AFE_PCM_NAME);
struct mtk_base_afe *afe = snd_soc_component_get_drvdata(component);
--
2.30.0.365.g02bc693789-goog
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH v3 3/3] ASoC: mediatek: mt8192-mt6359: simplify ops for Capture1 DAI link
2021-02-03 3:21 [PATCH v3 0/3] ASoC: mediatek: mt8192: apply some cleanup Tzung-Bi Shih
2021-02-03 3:21 ` [PATCH v3 1/3] ASoC: mediatek: mt8192-mt6359: use asoc_substream_to_rtd() Tzung-Bi Shih
2021-02-03 3:22 ` [PATCH v3 2/3] ASoC: mediatek: mt8192: " Tzung-Bi Shih
@ 2021-02-03 3:22 ` Tzung-Bi Shih
2021-02-04 19:53 ` [PATCH v3 0/3] ASoC: mediatek: mt8192: apply some cleanup Mark Brown
3 siblings, 0 replies; 5+ messages in thread
From: Tzung-Bi Shih @ 2021-02-03 3:22 UTC (permalink / raw)
To: broonie; +Cc: tzungbi, alsa-devel
1. Uses rtd->dev to get the device.
2. Generalizes the variable name.
Signed-off-by: Tzung-Bi Shih <tzungbi@google.com>
---
.../mt8192/mt8192-mt6359-rt1015-rt5682.c | 20 ++++++++-----------
1 file changed, 8 insertions(+), 12 deletions(-)
diff --git a/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c b/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c
index d2ebf3b6e359..a606133951b7 100644
--- a/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c
+++ b/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c
@@ -360,14 +360,8 @@ static int mt8192_i2s_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
}
static int
-mt8192_mt6359_rt1015_rt5682_cap1_startup(struct snd_pcm_substream *substream)
+mt8192_mt6359_cap1_startup(struct snd_pcm_substream *substream)
{
- struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
- struct snd_soc_component *component =
- snd_soc_rtdcom_lookup(rtd, AFE_PCM_NAME);
- struct mtk_base_afe *afe = snd_soc_component_get_drvdata(component);
- int ret;
-
static const unsigned int channels[] = {
1, 2, 4
};
@@ -385,13 +379,15 @@ mt8192_mt6359_rt1015_rt5682_cap1_startup(struct snd_pcm_substream *substream)
.mask = 0,
};
+ struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
struct snd_pcm_runtime *runtime = substream->runtime;
+ int ret;
ret = snd_pcm_hw_constraint_list(runtime, 0,
SNDRV_PCM_HW_PARAM_CHANNELS,
&constraints_channels);
if (ret < 0) {
- dev_err(afe->dev, "hw_constraint_list channels failed\n");
+ dev_err(rtd->dev, "hw_constraint_list channels failed\n");
return ret;
}
@@ -399,15 +395,15 @@ mt8192_mt6359_rt1015_rt5682_cap1_startup(struct snd_pcm_substream *substream)
SNDRV_PCM_HW_PARAM_RATE,
&constraints_rates);
if (ret < 0) {
- dev_err(afe->dev, "hw_constraint_list rate failed\n");
+ dev_err(rtd->dev, "hw_constraint_list rate failed\n");
return ret;
}
return 0;
}
-static const struct snd_soc_ops mt8192_mt6359_rt1015_rt5682_capture1_ops = {
- .startup = mt8192_mt6359_rt1015_rt5682_cap1_startup,
+static const struct snd_soc_ops mt8192_mt6359_capture1_ops = {
+ .startup = mt8192_mt6359_cap1_startup,
};
static int
@@ -768,7 +764,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = {
SND_SOC_DPCM_TRIGGER_PRE},
.dynamic = 1,
.dpcm_capture = 1,
- .ops = &mt8192_mt6359_rt1015_rt5682_capture1_ops,
+ .ops = &mt8192_mt6359_capture1_ops,
SND_SOC_DAILINK_REG(capture1),
},
{
--
2.30.0.365.g02bc693789-goog
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH v3 0/3] ASoC: mediatek: mt8192: apply some cleanup
2021-02-03 3:21 [PATCH v3 0/3] ASoC: mediatek: mt8192: apply some cleanup Tzung-Bi Shih
` (2 preceding siblings ...)
2021-02-03 3:22 ` [PATCH v3 3/3] ASoC: mediatek: mt8192-mt6359: simplify ops for Capture1 DAI link Tzung-Bi Shih
@ 2021-02-04 19:53 ` Mark Brown
3 siblings, 0 replies; 5+ messages in thread
From: Mark Brown @ 2021-02-04 19:53 UTC (permalink / raw)
To: Tzung-Bi Shih; +Cc: alsa-devel
On Wed, 3 Feb 2021 11:21:58 +0800, Tzung-Bi Shih wrote:
> The 1st and 2nd patch refactor to use asoc_substream_to_rtd().
>
> The 3rd patch simplifies ops of Capture1 DAI link.
>
> Changes from v2[1]:
> - Fix typo in 3rd patch's title, s/simply/simplify/.
>
> [...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/3] ASoC: mediatek: mt8192-mt6359: use asoc_substream_to_rtd()
commit: 8e59cf943fa7402f008de4b444beb0c5280317bc
[2/3] ASoC: mediatek: mt8192: use asoc_substream_to_rtd()
commit: 0840706d6c61658e51f42762c5b4f211b7596535
[3/3] ASoC: mediatek: mt8192-mt6359: simplify ops for Capture1 DAI link
commit: 4cceb42f4f401463b70d9e69c4771212707c51a8
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
^ permalink raw reply [flat|nested] 5+ messages in thread