ASoC: dwc: Disallow building designware_pcm as a module
authorJose Abreu <Jose.Abreu@synopsys.com>
Fri, 28 Apr 2017 09:55:25 +0000 (10:55 +0100)
committerMark Brown <broonie@kernel.org>
Sun, 30 Apr 2017 12:27:04 +0000 (20:27 +0800)
Designware PCM is an extension to Designware I2S and they are dependent
on each other. For this reason, make Designware PCM a boolean which will
compile with Desigwnare I2S module. The name of the module is not changed
but the name of the files need to be changed.

Also, without this commit we get errors when probbing designware_i2s module
because of unspecified license:

designware_pcm: module license 'unspecified' taints kernel.
Disabling lock debugging due to kernel taint
designware_pcm: Unknown symbol __rcu_read_lock (err 0)
designware_pcm: Unknown symbol devm_snd_soc_register_platform (err 0)
designware_pcm: Unknown symbol synchronize_rcu (err 0)
designware_pcm: Unknown symbol __rcu_read_unlock (err 0)
designware_pcm: Unknown symbol snd_soc_set_runtime_hwparams (err 0)

So, this is really needed as a fix.

Fixes: 79361b2b98b7 ("ASoC: dwc: Add PIO PCM extension")
Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
Signed-off-by: Jose Abreu <joabreu@synopsys.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/dwc/Kconfig
sound/soc/dwc/Makefile
sound/soc/dwc/dwc-i2s.c [moved from sound/soc/dwc/designware_i2s.c with 100% similarity]
sound/soc/dwc/dwc-pcm.c [moved from sound/soc/dwc/designware_pcm.c with 98% similarity]

index c297efe43861821e7313790d12c6613812e2b80c..c6fd95fa5ca69e1fda59e3a903857fe1c2137cad 100644 (file)
@@ -8,10 +8,10 @@ config SND_DESIGNWARE_I2S
         maximum of 8 channels each for play and record.
 
 config SND_DESIGNWARE_PCM
-       tristate "PCM PIO extension for I2S driver"
+       bool "PCM PIO extension for I2S driver"
        depends on SND_DESIGNWARE_I2S
        help
-        Say Y, M or N if you want to add a custom ALSA extension that registers
+        Say Y or N if you want to add a custom ALSA extension that registers
         a PCM and uses PIO to transfer data.
 
         This functionality is specially suited for I2S devices that don't have
index 38f1ca31c5fa021c717775070bb140d42759e165..3e24c0ff95fb8d3b4d7ca580f91ee8ce92e35faa 100644 (file)
@@ -1,5 +1,5 @@
 # SYNOPSYS Platform Support
 obj-$(CONFIG_SND_DESIGNWARE_I2S) += designware_i2s.o
-ifdef CONFIG_SND_DESIGNWARE_PCM
-obj-$(CONFIG_SND_DESIGNWARE_I2S) += designware_pcm.o
-endif
+
+designware_i2s-y := dwc-i2s.o
+designware_i2s-$(CONFIG_SND_DESIGNWARE_PCM) += dwc-pcm.o
similarity index 98%
rename from sound/soc/dwc/designware_pcm.c
rename to sound/soc/dwc/dwc-pcm.c
index 459ec861e6b6c84c04a7597dde059131523d6654..406fd867117b84dcdbefa4381b511338e6e12285 100644 (file)
@@ -129,13 +129,11 @@ void dw_pcm_push_tx(struct dw_i2s_dev *dev)
 {
        dw_pcm_transfer(dev, true);
 }
-EXPORT_SYMBOL_GPL(dw_pcm_push_tx);
 
 void dw_pcm_pop_rx(struct dw_i2s_dev *dev)
 {
        dw_pcm_transfer(dev, false);
 }
-EXPORT_SYMBOL_GPL(dw_pcm_pop_rx);
 
 static int dw_pcm_open(struct snd_pcm_substream *substream)
 {
@@ -281,4 +279,3 @@ int dw_pcm_register(struct platform_device *pdev)
 {
        return devm_snd_soc_register_platform(&pdev->dev, &dw_pcm_platform);
 }
-EXPORT_SYMBOL_GPL(dw_pcm_register);