Unverified Commit 899a8e7d authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: soc.h: random cleanup 

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

These are random cleanup for soc.h
parents e7ff7307 3289dc02

include/sound/soc.h

+6 −10
Original line number Diff line number Diff line
@@ -1062,7 +1062,8 @@ struct snd_soc_pcm_runtime { 
	unsigned int params_select; /* currently selected param for dai link */



	/* Dynamic PCM BE runtime data */

	struct snd_soc_dpcm_runtime dpcm[2];

	struct snd_soc_dpcm_runtime dpcm[SNDRV_PCM_STREAM_LAST + 1];

	struct snd_soc_dapm_widget *c2c_widget[SNDRV_PCM_STREAM_LAST + 1];



	long pmdown_time;
@@ -1078,11 +1079,6 @@ struct snd_soc_pcm_runtime { 
	 *	asoc_rtd_to_codec()

	 */

	struct snd_soc_dai **dais;

	unsigned int num_codecs;

	unsigned int num_cpus;



	struct snd_soc_dapm_widget *playback_widget;

	struct snd_soc_dapm_widget *capture_widget;



	struct delayed_work delayed_work;

	void (*close_delayed_work_func)(struct snd_soc_pcm_runtime *rtd);
@@ -1108,7 +1104,7 @@ struct snd_soc_pcm_runtime { 
};

/* see soc_new_pcm_runtime()  */

#define asoc_rtd_to_cpu(rtd, n)   (rtd)->dais[n]

#define asoc_rtd_to_codec(rtd, n) (rtd)->dais[n + (rtd)->num_cpus]

#define asoc_rtd_to_codec(rtd, n) (rtd)->dais[n + (rtd)->dai_link->num_cpus]

#define asoc_substream_to_rtd(substream) \

	(struct snd_soc_pcm_runtime *)snd_pcm_substream_chip(substream)
@@ -1118,15 +1114,15 @@ struct snd_soc_pcm_runtime { 
	     (i)++)

#define for_each_rtd_cpu_dais(rtd, i, dai)				\

	for ((i) = 0;							\

	     ((i) < rtd->num_cpus) && ((dai) = asoc_rtd_to_cpu(rtd, i)); \

	     ((i) < rtd->dai_link->num_cpus) && ((dai) = asoc_rtd_to_cpu(rtd, i)); \

	     (i)++)

#define for_each_rtd_codec_dais(rtd, i, dai)				\

	for ((i) = 0;							\

	     ((i) < rtd->num_codecs) && ((dai) = asoc_rtd_to_codec(rtd, i)); \

	     ((i) < rtd->dai_link->num_codecs) && ((dai) = asoc_rtd_to_codec(rtd, i)); \

	     (i)++)

#define for_each_rtd_dais(rtd, i, dai)					\

	for ((i) = 0;							\

	     ((i) < (rtd)->num_cpus + (rtd)->num_codecs) &&		\

	     ((i) < (rtd)->dai_link->num_cpus + (rtd)->dai_link->num_codecs) &&	\

		     ((dai) = (rtd)->dais[i]);				\

	     (i)++)

sound/soc/amd/vangogh/acp5x-mach.c

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ static int acp5x_cs35l41_hw_params(struct snd_pcm_substream *substream, 
	struct snd_soc_card *card = rtd->card;

	struct snd_soc_dai *codec_dai;

	int ret, i;

	unsigned int num_codecs = rtd->num_codecs;

	unsigned int num_codecs = rtd->dai_link->num_codecs;

	unsigned int bclk_val;



	ret = 0;

sound/soc/samsung/odroid.c

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ static int odroid_card_be_hw_params(struct snd_pcm_substream *substream, 
	if (ret < 0)

		return ret;



	if (rtd->num_codecs > 1) {

	if (rtd->dai_link->num_codecs > 1) {

		struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 1);



		ret = snd_soc_dai_set_sysclk(codec_dai, 0, rclk_freq,

sound/soc/soc-compress.c

+2 −2
Original line number Diff line number Diff line
@@ -560,8 +560,8 @@ int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num) 
	BUILD_BUG_ON((int)SNDRV_PCM_STREAM_PLAYBACK != (int)SND_COMPRESS_PLAYBACK);

	BUILD_BUG_ON((int)SNDRV_PCM_STREAM_CAPTURE  != (int)SND_COMPRESS_CAPTURE);



	if (rtd->num_cpus > 1 ||

	    rtd->num_codecs > 1) {

	if (rtd->dai_link->num_cpus > 1 ||

	    rtd->dai_link->num_codecs > 1) {

		dev_err(rtd->card->dev,

			"Compress ASoC: Multi CPU/Codec not supported\n");

		return -EINVAL;

sound/soc/soc-core.c

+1 −3
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ static umode_t soc_dev_attr_is_visible(struct kobject *kobj, 


	if (attr == &dev_attr_pmdown_time.attr)

		return attr->mode; /* always visible */

	return rtd->num_codecs ? attr->mode : 0; /* enabled only with codec */

	return rtd->dai_link->num_codecs ? attr->mode : 0; /* enabled only with codec */

}



static const struct attribute_group soc_dapm_dev_group = {
@@ -482,8 +482,6 @@ static struct snd_soc_pcm_runtime *soc_new_pcm_runtime( 
	 *	asoc_rtd_to_cpu()

	 *	asoc_rtd_to_codec()

	 */

	rtd->num_cpus	= dai_link->num_cpus;

	rtd->num_codecs	= dai_link->num_codecs;

	rtd->card	= card;

	rtd->dai_link	= dai_link;

	rtd->num	= card->num_rtd++;