Skip to contentSkip to conversation

ASoC: Allow imx-pcm-{dma,fiq}.c to be modules

PATCH In review Arnd Bergmann 2 participants 5 messages Jul 5, 2013

Subsystems (4)
Sound Arm i.MX and Layerscape ASoC Freescale SoC sound drivers
lore
Share & tools
lore

Arnd Bergmann

author
#0 lore raw

PATCH 1/1 ASoC: Allow imx-pcm-{dma,fiq}.c to be modules

This is required so we can build the imx sound support when ALSA itself is a loadable module.

Signed-off-by Arnd Bergmann <[email protected]>
Cc [email protected]
Cc Mark Brown <[email protected]>
Cc Fabio Estevam <[email protected]>
sound/soc/fsl/Kconfig +2 -2
index aa43854..805b83e 100644
@@ -109,11 +109,11 @@ config SND_SOC_IMX_SSI
 	tristate
 
 config SND_SOC_IMX_PCM_FIQ
-	bool
+	tristate
 	select FIQ
 
 config SND_SOC_IMX_PCM_DMA
-	bool
+	tristate
 	select SND_SOC_GENERIC_DMAENGINE_PCM
 
 config SND_SOC_IMX_AUDMUX
sound/soc/fsl/imx-pcm.h +2 -2
index 67f656c..0e3619e 100644
@@ -32,7 +32,7 @@ imx_pcm_dma_params_init_data(struct imx_dma_data *dma_data,
 		dma_data->peripheral_type = IMX_DMATYPE_SSI;
 }
 
-#ifdef CONFIG_SND_SOC_IMX_PCM_DMA
+#if IS_ENABLED(CONFIG_SND_SOC_IMX_PCM_DMA)
 int imx_pcm_dma_init(struct platform_device *pdev);
 void imx_pcm_dma_exit(struct platform_device *pdev);
 #else

@@ -46,7 +46,7 @@ static inline void imx_pcm_dma_exit(struct platform_device *pdev)
 }
 #endif
 
-#ifdef CONFIG_SND_SOC_IMX_PCM_FIQ
+#if IS_ENABLED(CONFIG_SND_SOC_IMX_PCM_FIQ)
 int imx_pcm_fiq_init(struct platform_device *pdev);
 void imx_pcm_fiq_exit(struct platform_device *pdev);
 #else
maintainer
#1 lore raw
Quoted 2 lines · Arnd Bergmann

This is required so we can build the imx sound support when ALSA itself is a loadable module.

Is this actually OK with the FIQ APIs?

author
#2 lore raw
Quoted 6 lines · Mark Brown
Quoted 2 lines · Arnd Bergmann

This is required so we can build the imx sound support when ALSA itself is a loadable module.

Is this actually OK with the FIQ APIs?

I don't know. Why wouldn't it?

Other users of the same interfaces (mx1_camera, spi-s3c24xx) can also be modules, so I wouldn't expect a fundamental issue.

Arnd

maintainer
#3 lore raw
Quoted 5 lines · Arnd Bergmann
Quoted 1 line · Mark Brown

Is this actually OK with the FIQ APIs?

I don't know. Why wouldn't it?

It was the only reason I could think of why that'd have been done.

Quoted 2 lines

Other users of the same interfaces (mx1_camera, spi-s3c24xx) can also be modules, so I wouldn't expect a fundamental issue.

OK.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130705/c6dd9378/attachment.sig>

author
#4 lore raw
Quoted 8 lines · Mark Brown
Quoted 5 lines · Arnd Bergmann
Quoted 1 line · Mark Brown

Is this actually OK with the FIQ APIs?

I don't know. Why wouldn't it?

It was the only reason I could think of why that'd have been done.

I looked in the log and found this part has been patched a couple of times already, going back and forth between "bool" and "tristate", always to fix build errors.

Please hold back for now, I'll try to reproduce on the bug on the current torvalds tree first. I know it was broken in linux-next as of a few weeks ago, but something else may have changed in the meantime.

Arnd