ASoC: stm32: i2s: use default dai name (fef050c8) · Commits · 戴 / test

sound/soc/stm/stm32_i2s.c

+0 −7

Original line number	Diff line number	Diff line
		@@ -179,7 +179,6 @@ enum i2s_datlen {
		I2S_I2SMOD_DATLEN_32,
		};

		#define STM32_I2S_DAI_NAME_SIZE 20
		#define STM32_I2S_FIFO_SIZE 16

		#define STM32_I2S_IS_MASTER(x) ((x)->ms_flg == I2S_MS_MASTER)
		@@ -202,7 +201,6 @@ enum i2s_datlen {
		* @phys_addr: I2S registers physical base address
		* @lock_fd: lock to manage race conditions in full duplex mode
		* @irq_lock: prevent race condition with IRQ
		* @dais_name: DAI name
		* @mclk_rate: master clock frequency (Hz)
		* @fmt: DAI protocol
		* @refcount: keep count of opened streams on I2S
		@@ -224,7 +222,6 @@ struct stm32_i2s_data {
		dma_addr_t phys_addr;
		spinlock_t lock_fd; /* Manage race conditions for full duplex */
		spinlock_t irq_lock; /* used to prevent race condition with IRQ */
		char dais_name[STM32_I2S_DAI_NAME_SIZE];
		unsigned int mclk_rate;
		unsigned int fmt;
		int refcount;
		@@ -771,12 +768,8 @@ static int stm32_i2s_dais_init(struct platform_device *pdev,
		if (!dai_ptr)
		return -ENOMEM;

		snprintf(i2s->dais_name, STM32_I2S_DAI_NAME_SIZE,
		"%s", dev_name(&pdev->dev));

		dai_ptr->probe = stm32_i2s_dai_probe;
		dai_ptr->ops = &stm32_i2s_pcm_dai_ops;
		dai_ptr->name = i2s->dais_name;
		dai_ptr->id = 1;
		stm32_i2s_dai_init(&dai_ptr->playback, "playback");
		stm32_i2s_dai_init(&dai_ptr->capture, "capture");