Unverified Commit 6570befb authored Jan 31, 2023 by Mark Brown

ASoC: use helper function and cleanup

Merge series from Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>:

struct snd_soc_dai need to have info for playback/capture,
but it is using "playback/capture_xxx" or "tx/tx_xxx" or array.
This kind of random definition is very difficult to read.

This patch-set add helper functions and each driver use it.
And cleanup the definition.

parents 01b17067 3653480c

include/sound/soc-dai.h

+53 −37

Original line number	Diff line number	Diff line
		@@ -423,6 +423,16 @@ struct snd_soc_dai_driver {
		int remove_order;
		};

		/* for Playback/Capture */
		struct snd_soc_dai_stream {
		struct snd_soc_dapm_widget *widget;

		unsigned int active; /* usage count */
		unsigned int tdm_mask; /* CODEC TDM slot masks and params (for fixup) */

		void dma_data; / DAI DMA data */
		};

		/*
		* Digital Audio Interface runtime data.
		*
		@@ -437,14 +447,7 @@ struct snd_soc_dai {
		struct snd_soc_dai_driver *driver;

		/* DAI runtime info */
		unsigned int stream_active[SNDRV_PCM_STREAM_LAST + 1]; /* usage count */

		struct snd_soc_dapm_widget *playback_widget;
		struct snd_soc_dapm_widget *capture_widget;

		/* DAI DMA data */
		void *playback_dma_data;
		void *capture_dma_data;
		struct snd_soc_dai_stream stream[SNDRV_PCM_STREAM_LAST + 1];

		/* Symmetry data - only valid if symmetry is being enforced */
		unsigned int rate;
		@@ -454,10 +457,6 @@ struct snd_soc_dai {
		/* parent platform/codec */
		struct snd_soc_component *component;

		/* CODEC TDM slot masks and params (for fixup) */
		unsigned int tx_mask;
		unsigned int rx_mask;

		struct list_head list;

		/* function mark */
		@@ -477,36 +476,59 @@ snd_soc_dai_get_pcm_stream(const struct snd_soc_dai *dai, int stream)
		&dai->driver->playback : &dai->driver->capture;
		}

		#define snd_soc_dai_get_widget_playback(dai) snd_soc_dai_get_widget(dai, SNDRV_PCM_STREAM_PLAYBACK)
		#define snd_soc_dai_get_widget_capture(dai) snd_soc_dai_get_widget(dai, SNDRV_PCM_STREAM_CAPTURE)
		static inline
		struct snd_soc_dapm_widget *snd_soc_dai_get_widget(
		struct snd_soc_dai *dai, int stream)
		struct snd_soc_dapm_widget snd_soc_dai_get_widget(struct snd_soc_dai dai, int stream)
		{
		return (stream == SNDRV_PCM_STREAM_PLAYBACK) ?
		dai->playback_widget : dai->capture_widget;
		return dai->stream[stream].widget;
		}

		static inline void snd_soc_dai_get_dma_data(const struct snd_soc_dai dai,
		const struct snd_pcm_substream *ss)
		#define snd_soc_dai_set_widget_playback(dai, widget) snd_soc_dai_set_widget(dai, SNDRV_PCM_STREAM_PLAYBACK, widget)
		#define snd_soc_dai_set_widget_capture(dai, widget) snd_soc_dai_set_widget(dai, SNDRV_PCM_STREAM_CAPTURE, widget)
		static inline
		void snd_soc_dai_set_widget(struct snd_soc_dai dai, int stream, struct snd_soc_dapm_widget widget)
		{
		return (ss->stream == SNDRV_PCM_STREAM_PLAYBACK) ?
		dai->playback_dma_data : dai->capture_dma_data;
		dai->stream[stream].widget = widget;
		}

		static inline void snd_soc_dai_set_dma_data(struct snd_soc_dai *dai,
		const struct snd_pcm_substream *ss,
		void *data)
		#define snd_soc_dai_dma_data_get_playback(dai) snd_soc_dai_dma_data_get(dai, SNDRV_PCM_STREAM_PLAYBACK)
		#define snd_soc_dai_dma_data_get_capture(dai) snd_soc_dai_dma_data_get(dai, SNDRV_PCM_STREAM_CAPTURE)
		#define snd_soc_dai_get_dma_data(dai, ss) snd_soc_dai_dma_data_get(dai, ss->stream)
		static inline void snd_soc_dai_dma_data_get(const struct snd_soc_dai dai, int stream)
		{
		if (ss->stream == SNDRV_PCM_STREAM_PLAYBACK)
		dai->playback_dma_data = data;
		else
		dai->capture_dma_data = data;
		return dai->stream[stream].dma_data;
		}

		#define snd_soc_dai_dma_data_set_playback(dai, data) snd_soc_dai_dma_data_set(dai, SNDRV_PCM_STREAM_PLAYBACK, data)
		#define snd_soc_dai_dma_data_set_capture(dai, data) snd_soc_dai_dma_data_set(dai, SNDRV_PCM_STREAM_CAPTURE, data)
		#define snd_soc_dai_set_dma_data(dai, ss, data) snd_soc_dai_dma_data_set(dai, ss->stream, data)
		static inline void snd_soc_dai_dma_data_set(struct snd_soc_dai dai, int stream, void data)
		{
		dai->stream[stream].dma_data = data;
		}

		static inline void snd_soc_dai_init_dma_data(struct snd_soc_dai dai, void playback, void *capture)
		{
		snd_soc_dai_dma_data_set_playback(dai, playback);
		snd_soc_dai_dma_data_set_capture(dai, capture);
		}

		static inline unsigned int snd_soc_dai_tdm_mask_get(struct snd_soc_dai *dai, int stream)
		{
		return dai->stream[stream].tdm_mask;
		}

		static inline void snd_soc_dai_init_dma_data(struct snd_soc_dai *dai,
		void playback, void capture)
		static inline void snd_soc_dai_tdm_mask_set(struct snd_soc_dai *dai, int stream,
		unsigned int tdm_mask)
		{
		dai->playback_dma_data = playback;
		dai->capture_dma_data = capture;
		dai->stream[stream].tdm_mask = tdm_mask;
		}

		static inline unsigned int snd_soc_dai_stream_active(struct snd_soc_dai *dai, int stream)
		{
		/* see snd_soc_dai_action() for setup */
		return dai->stream[stream].active;
		}

		static inline void snd_soc_dai_set_drvdata(struct snd_soc_dai *dai,
		@@ -561,10 +583,4 @@ static inline void snd_soc_dai_get_stream(struct snd_soc_dai dai,
		return ERR_PTR(-ENOTSUPP);
		}

		static inline unsigned int
		snd_soc_dai_stream_active(struct snd_soc_dai *dai, int stream)
		{
		return dai->stream_active[stream];
		}

		#endif

include/sound/soc.h

+6 −0

Original line number	Diff line number	Diff line
		@@ -1052,6 +1052,12 @@ struct snd_soc_card {
		#define for_each_card_widgets_safe(card, w, _w) \
		list_for_each_entry_safe(w, _w, &card->widgets, list)


		static inline int snd_soc_card_is_instantiated(struct snd_soc_card *card)
		{
		return card && card->instantiated;
		}

		/* SoC machine DAI configuration, glues a codec and cpu DAI together */
		struct snd_soc_pcm_runtime {
		struct device *dev;

sound/soc/cirrus/ep93xx-ac97.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -323,8 +323,8 @@ static int ep93xx_ac97_dai_probe(struct snd_soc_dai *dai)
		info->dma_params_tx.filter_data = &ep93xx_ac97_pcm_out;
		info->dma_params_rx.filter_data = &ep93xx_ac97_pcm_in;

		dai->playback_dma_data = &info->dma_params_tx;
		dai->capture_dma_data = &info->dma_params_rx;
		snd_soc_dai_init_dma_data(dai, &info->dma_params_tx,
		&info->dma_params_rx);

		return 0;
		}

sound/soc/cirrus/ep93xx-i2s.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -202,8 +202,8 @@ static int ep93xx_i2s_dai_probe(struct snd_soc_dai *dai)
		info->dma_params_rx.filter_data =
		&ep93xx_i2s_dma_data[SNDRV_PCM_STREAM_CAPTURE];

		dai->playback_dma_data = &info->dma_params_tx;
		dai->capture_dma_data = &info->dma_params_rx;
		snd_soc_dai_init_dma_data(dai, &info->dma_params_tx,
		&info->dma_params_rx);

		return 0;
		}

sound/soc/codecs/hda.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -126,12 +126,15 @@ static void hda_codec_unregister_dais(struct hda_codec *codec,
		struct hda_pcm *pcm;

		for_each_component_dais_safe(component, dai, save) {
		int stream;

		list_for_each_entry(pcm, &codec->pcm_list_head, list) {
		if (strcmp(dai->driver->name, pcm->name))
		continue;

		snd_soc_dapm_free_widget(dai->playback_widget);
		snd_soc_dapm_free_widget(dai->capture_widget);
		for_each_pcm_streams(stream)
		snd_soc_dapm_free_widget(snd_soc_dai_get_widget(dai, stream));

		snd_soc_unregister_dai(dai);
		break;
		}