diff mbox series

soundwire: intel: use asoc_rtd_to_cpu() / asoc_rtd_to_codec() macro for DAI pointer

Message ID 87y2qqvdxu.wl-kuninori.morimoto.gx@renesas.com (mailing list archive)
State Accepted
Commit 4eb542cc88c1c255a70e745b12ae913cd3edb535
Headers show
Series soundwire: intel: use asoc_rtd_to_cpu() / asoc_rtd_to_codec() macro for DAI pointer | expand

Commit Message

Kuninori Morimoto April 20, 2020, 7:01 a.m. UTC 
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

Now ALSA SoC needs to use asoc_rtd_to_codec(),
otherwise, it will be compile error.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
 drivers/soundwire/intel.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Vinod Koul April 20, 2020, 7:08 a.m. UTC | #1 
On 20-04-20, 16:01, Kuninori Morimoto wrote:
> From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> 
> Now ALSA SoC needs to use asoc_rtd_to_codec(),
> otherwise, it will be compile error.

Applied, thanks
Mark Brown April 20, 2020, 12:03 p.m. UTC | #2 
On Mon, Apr 20, 2020 at 12:38:16PM +0530, Vinod Koul wrote:
> On 20-04-20, 16:01, Kuninori Morimoto wrote:

> > Now ALSA SoC needs to use asoc_rtd_to_codec(),
> > otherwise, it will be compile error.

> Applied, thanks

This fix is needed in the ASoC tree - are you OK with me applying it
there?
Vinod Koul April 20, 2020, 12:17 p.m. UTC | #3 
On 20-04-20, 13:03, Mark Brown wrote:
> On Mon, Apr 20, 2020 at 12:38:16PM +0530, Vinod Koul wrote:
> > On 20-04-20, 16:01, Kuninori Morimoto wrote:
> 
> > > Now ALSA SoC needs to use asoc_rtd_to_codec(),
> > > otherwise, it will be compile error.
> 
> > Applied, thanks
> 
> This fix is needed in the ASoC tree - are you OK with me applying it
> there?

Sure..

Acked-By: Vinod Koul <vkoul@kernel.org>
Mark Brown April 20, 2020, 2:01 p.m. UTC | #4 
On Mon, Apr 20, 2020 at 05:47:52PM +0530, Vinod Koul wrote:
> On 20-04-20, 13:03, Mark Brown wrote:

> > > Applied, thanks

> > This fix is needed in the ASoC tree - are you OK with me applying it
> > there?

> Sure..

> Acked-By: Vinod Koul <vkoul@kernel.org>

Hrm, actually this doesn't seem to apply against the ASoC tree - looks
like we might need a cross tree merge if there's still issues in -next.
Vinod Koul April 20, 2020, 3:06 p.m. UTC | #5 
On 20-04-20, 15:01, Mark Brown wrote:
> On Mon, Apr 20, 2020 at 05:47:52PM +0530, Vinod Koul wrote:
> > On 20-04-20, 13:03, Mark Brown wrote:
> 
> > > > Applied, thanks
> 
> > > This fix is needed in the ASoC tree - are you OK with me applying it
> > > there?
> 
> > Sure..
> 
> > Acked-By: Vinod Koul <vkoul@kernel.org>
> 
> Hrm, actually this doesn't seem to apply against the ASoC tree - looks
> like we might need a cross tree merge if there's still issues in -next.


That seems strange, it applied fine for me on -rc1. Let me know if you
are seeing issues with this...
Mark Brown April 20, 2020, 3:31 p.m. UTC | #6 
On 20 Apr 2020 16:01:01 +0900, Kuninori Morimoto wrote:
> From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> 
> Now ALSA SoC needs to use asoc_rtd_to_codec(),
> otherwise, it will be compile error.
> 
> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> Acked-By: Vinod Koul <vkoul@kernel.org>
> 
> [...]

Applied to

	https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.7

Thanks!

[1/1] soundwire: intel: use asoc_rtd_to_cpu() / asoc_rtd_to_codec() macro for DAI pointer
      commit: c74a793806537d8564064cfb1b58488c3d4b70c9

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
diff mbox series

Patch

diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c
index 3c83e76c6bf9..ed8d576bf5dc 100644
--- a/drivers/soundwire/intel.c
+++ b/drivers/soundwire/intel.c
@@ -669,11 +669,11 @@  static int sdw_stream_setup(struct snd_pcm_substream *substream,
 
 	/* Set stream pointer on all CODEC DAIs */
 	for (i = 0; i < rtd->num_codecs; i++) {
-		ret = snd_soc_dai_set_sdw_stream(rtd->codec_dais[i], sdw_stream,
+		ret = snd_soc_dai_set_sdw_stream(asoc_rtd_to_codec(rtd, i), sdw_stream,
 						 substream->stream);
 		if (ret < 0) {
 			dev_err(dai->dev, "failed to set stream pointer on codec dai %s",
-				rtd->codec_dais[i]->name);
+				asoc_rtd_to_codec(rtd, i)->name);
 			goto release_stream;
 		}
 	}