* [PATCH] ASoC: da732x: Merge da732x_dai1_ops and da732x_dai2_ops
@ 2015-07-15 1:51 Axel Lin
2015-07-15 8:39 ` Opensource [Adam Thomson]
2015-07-15 11:55 ` Applied "ASoC: da732x: Merge da732x_dai1_ops and da732x_dai2_ops" to the asoc tree Mark Brown
0 siblings, 2 replies; 3+ messages in thread
From: Axel Lin @ 2015-07-15 1:51 UTC (permalink / raw)
To: Mark Brown
Cc: Adam Thomson, Support Opensource, Michal Hajduk, alsa-devel,
Liam Girdwood
da732x_dai1_ops is identical to da732x_dai2_ops, so merge them to
da732x_dai_ops. The da732x_dai_ops is not modified after initialization,
so make it const.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
---
sound/soc/codecs/da732x.c | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/sound/soc/codecs/da732x.c b/sound/soc/codecs/da732x.c
index b1cb465..29251b0 100644
--- a/sound/soc/codecs/da732x.c
+++ b/sound/soc/codecs/da732x.c
@@ -1196,13 +1196,7 @@ static int da732x_set_dai_sysclk(struct snd_soc_dai *dai, int clk_id,
#define DA732X_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE | \
SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE)
-static struct snd_soc_dai_ops da732x_dai1_ops = {
- .hw_params = da732x_hw_params,
- .set_fmt = da732x_set_dai_fmt,
- .set_sysclk = da732x_set_dai_sysclk,
-};
-
-static struct snd_soc_dai_ops da732x_dai2_ops = {
+static const struct snd_soc_dai_ops da732x_dai_ops = {
.hw_params = da732x_hw_params,
.set_fmt = da732x_set_dai_fmt,
.set_sysclk = da732x_set_dai_sysclk,
@@ -1227,7 +1221,7 @@ static struct snd_soc_dai_driver da732x_dai[] = {
.rates = DA732X_RATES,
.formats = DA732X_FORMATS,
},
- .ops = &da732x_dai1_ops,
+ .ops = &da732x_dai_ops,
},
{
.name = "DA732X_AIFB",
@@ -1247,7 +1241,7 @@ static struct snd_soc_dai_driver da732x_dai[] = {
.rates = DA732X_RATES,
.formats = DA732X_FORMATS,
},
- .ops = &da732x_dai2_ops,
+ .ops = &da732x_dai_ops,
},
};
--
2.1.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] ASoC: da732x: Merge da732x_dai1_ops and da732x_dai2_ops
2015-07-15 1:51 [PATCH] ASoC: da732x: Merge da732x_dai1_ops and da732x_dai2_ops Axel Lin
@ 2015-07-15 8:39 ` Opensource [Adam Thomson]
2015-07-15 11:55 ` Applied "ASoC: da732x: Merge da732x_dai1_ops and da732x_dai2_ops" to the asoc tree Mark Brown
1 sibling, 0 replies; 3+ messages in thread
From: Opensource [Adam Thomson] @ 2015-07-15 8:39 UTC (permalink / raw)
To: Axel Lin, Mark Brown
Cc: Opensource [Adam Thomson], Support Opensource, Michal Hajduk,
alsa-devel@alsa-project.org, Liam Girdwood
On 15 July, 2015 02:52, Axel Lin wrote:
> da732x_dai1_ops is identical to da732x_dai2_ops, so merge them to
> da732x_dai_ops. The da732x_dai_ops is not modified after initialization,
> so make it const.
>
> Signed-off-by: Axel Lin <axel.lin@ingics.com>
> ---
> sound/soc/codecs/da732x.c | 12 +++---------
> 1 file changed, 3 insertions(+), 9 deletions(-)
>
> diff --git a/sound/soc/codecs/da732x.c b/sound/soc/codecs/da732x.c
> index b1cb465..29251b0 100644
> --- a/sound/soc/codecs/da732x.c
> +++ b/sound/soc/codecs/da732x.c
> @@ -1196,13 +1196,7 @@ static int da732x_set_dai_sysclk(struct snd_soc_dai *dai,
> int clk_id,
> #define DA732X_FORMATS (SNDRV_PCM_FMTBIT_S16_LE |
> SNDRV_PCM_FMTBIT_S20_3LE | \
> SNDRV_PCM_FMTBIT_S24_LE |
> SNDRV_PCM_FMTBIT_S32_LE)
>
> -static struct snd_soc_dai_ops da732x_dai1_ops = {
> - .hw_params = da732x_hw_params,
> - .set_fmt = da732x_set_dai_fmt,
> - .set_sysclk = da732x_set_dai_sysclk,
> -};
> -
> -static struct snd_soc_dai_ops da732x_dai2_ops = {
> +static const struct snd_soc_dai_ops da732x_dai_ops = {
> .hw_params = da732x_hw_params,
> .set_fmt = da732x_set_dai_fmt,
> .set_sysclk = da732x_set_dai_sysclk,
> @@ -1227,7 +1221,7 @@ static struct snd_soc_dai_driver da732x_dai[] = {
> .rates = DA732X_RATES,
> .formats = DA732X_FORMATS,
> },
> - .ops = &da732x_dai1_ops,
> + .ops = &da732x_dai_ops,
> },
> {
> .name = "DA732X_AIFB",
> @@ -1247,7 +1241,7 @@ static struct snd_soc_dai_driver da732x_dai[] = {
> .rates = DA732X_RATES,
> .formats = DA732X_FORMATS,
> },
> - .ops = &da732x_dai2_ops,
> + .ops = &da732x_dai_ops,
> },
> };
>
> --
> 2.1.0
>
>
Acked-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Applied "ASoC: da732x: Merge da732x_dai1_ops and da732x_dai2_ops" to the asoc tree
2015-07-15 1:51 [PATCH] ASoC: da732x: Merge da732x_dai1_ops and da732x_dai2_ops Axel Lin
2015-07-15 8:39 ` Opensource [Adam Thomson]
@ 2015-07-15 11:55 ` Mark Brown
1 sibling, 0 replies; 3+ messages in thread
From: Mark Brown @ 2015-07-15 11:55 UTC (permalink / raw)
To: Axel Lin, Adam Thomson, Mark Brown; +Cc: alsa-devel
The patch
ASoC: da732x: Merge da732x_dai1_ops and da732x_dai2_ops
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
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
>From a01da00cbccc162a86c78f61ed4ca55dad35440f Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Wed, 15 Jul 2015 09:51:33 +0800
Subject: [PATCH] ASoC: da732x: Merge da732x_dai1_ops and da732x_dai2_ops
da732x_dai1_ops is identical to da732x_dai2_ops, so merge them to
da732x_dai_ops. The da732x_dai_ops is not modified after initialization,
so make it const.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Acked-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/codecs/da732x.c | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/sound/soc/codecs/da732x.c b/sound/soc/codecs/da732x.c
index 207523686bd5..760935ac9fd9 100644
--- a/sound/soc/codecs/da732x.c
+++ b/sound/soc/codecs/da732x.c
@@ -1196,13 +1196,7 @@ static int da732x_set_dai_sysclk(struct snd_soc_dai *dai, int clk_id,
#define DA732X_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE | \
SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE)
-static struct snd_soc_dai_ops da732x_dai1_ops = {
- .hw_params = da732x_hw_params,
- .set_fmt = da732x_set_dai_fmt,
- .set_sysclk = da732x_set_dai_sysclk,
-};
-
-static struct snd_soc_dai_ops da732x_dai2_ops = {
+static const struct snd_soc_dai_ops da732x_dai_ops = {
.hw_params = da732x_hw_params,
.set_fmt = da732x_set_dai_fmt,
.set_sysclk = da732x_set_dai_sysclk,
@@ -1227,7 +1221,7 @@ static struct snd_soc_dai_driver da732x_dai[] = {
.rates = DA732X_RATES,
.formats = DA732X_FORMATS,
},
- .ops = &da732x_dai1_ops,
+ .ops = &da732x_dai_ops,
},
{
.name = "DA732X_AIFB",
@@ -1247,7 +1241,7 @@ static struct snd_soc_dai_driver da732x_dai[] = {
.rates = DA732X_RATES,
.formats = DA732X_FORMATS,
},
- .ops = &da732x_dai2_ops,
+ .ops = &da732x_dai_ops,
},
};
--
2.1.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-07-15 11:55 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-07-15 1:51 [PATCH] ASoC: da732x: Merge da732x_dai1_ops and da732x_dai2_ops Axel Lin
2015-07-15 8:39 ` Opensource [Adam Thomson]
2015-07-15 11:55 ` Applied "ASoC: da732x: Merge da732x_dai1_ops and da732x_dai2_ops" to the asoc tree Mark Brown
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.