[alsa-devel] [PATCH] ARM: allmodconfig regressions in linux-next
Hi everyone,
These are a couple of simple patches to fix bugs that break allyesconfig and that are only present in linux-next at the moment. Please apply to the appropriate trees or provide feedback!
Arnd Bergmann (5): mfd: ab8500: remove broken ab8500_debug_register_interrupt logic usb: phy: phy core cannot yet be a module ASoC: don't call of_dma_request_slave_channel directly hwrng: bcm2835: fix MODULE_LICENSE tag clocksource: kona: adapt to CLOCKSOURCE_OF_DECLARE change
drivers/char/hw_random/bcm2835-rng.c | 2 +- drivers/clocksource/bcm_kona_timer.c | 15 ++++----------- drivers/mfd/ab8500-debugfs.c | 10 ---------- drivers/usb/phy/Kconfig | 2 +- sound/soc/soc-generic-dmaengine-pcm.c | 9 +++++---- 5 files changed, 11 insertions(+), 27 deletions(-)
Cc: Christian Daudt csd@broadcom.com Cc: Dom Cobley popcornmix@gmail.com Cc: Felipe Balbi balbi@ti.com Cc: Greg Kroah-Hartman gregkh@linuxfoundation.org Cc: Herbert Xu herbert@gondor.apana.org.au Cc: John Stultz john.stultz@linaro.org Cc: Jonas ABERG jonas.aberg@stericsson.com Cc: Lars-Peter Clausen lars@metafoo.de Cc: Lee Jones lee.jones@linaro.org Cc: Linus Walleij linus.walleij@stericsson.com Cc: Lubomir Rintel lkundrak@v3.sk Cc: Mark Brown broonie@opensource.wolfsonmicro.com Cc: Matt Mackall mpm@selenic.com Cc: Mattias WALLIN mattias.wallin@stericsson.com Cc: Per FORLIN per.forlin@stericsson.com Cc: Samuel Ortiz sameo@linux.intel.com Cc: Shawn Guo shawn.guo@linaro.org Cc: Stephen Warren swarren@wwwdotorg.org Cc: alsa-devel@alsa-project.org Cc: linux-rpi-kernel@lists.infradead.org Cc: linux-usb@vger.kernel.org Cc: srinidhi kasagar srinidhi.kasagar@stericsson.com
The exported interface for device drivers is dma_request_slave_channel, not of_dma_request_slave_channel. The former does not depend on device tree but also works with ACPI and other interfaces providing an abstraction for DMA channels.
This fixes link errors when building ALSA as a loadable module.
Signed-off-by: Arnd Bergmann arnd@arndb.de Cc: alsa-devel@alsa-project.org Cc: Lars-Peter Clausen lars@metafoo.de Cc: Shawn Guo shawn.guo@linaro.org Cc: Mark Brown broonie@opensource.wolfsonmicro.com --- sound/soc/soc-generic-dmaengine-pcm.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/sound/soc/soc-generic-dmaengine-pcm.c b/sound/soc/soc-generic-dmaengine-pcm.c index 5fd5ed4..8ee9859 100644 --- a/sound/soc/soc-generic-dmaengine-pcm.c +++ b/sound/soc/soc-generic-dmaengine-pcm.c @@ -219,19 +219,20 @@ static const char * const dmaengine_pcm_dma_channel_names[] = { };
static void dmaengine_pcm_request_chan_of(struct dmaengine_pcm *pcm, - struct device_node *of_node) + struct device *dev) { unsigned int i; + struct device_node *of_node = dev->of_node;
if ((pcm->flags & SND_DMAENGINE_PCM_FLAG_NO_DT) || !of_node) return;
if (pcm->flags & SND_DMAENGINE_PCM_FLAG_HALF_DUPLEX) { - pcm->chan[0] = of_dma_request_slave_channel(of_node, "tx_rx"); + pcm->chan[0] = dma_request_slave_channel(dev, "tx_rx"); pcm->chan[1] = pcm->chan[0]; } else { for (i = SNDRV_PCM_STREAM_PLAYBACK; i <= SNDRV_PCM_STREAM_CAPTURE; i++) { - pcm->chan[i] = of_dma_request_slave_channel(of_node, + pcm->chan[i] = dma_request_slave_channel(dev, dmaengine_pcm_dma_channel_names[i]); } } @@ -255,7 +256,7 @@ int snd_dmaengine_pcm_register(struct device *dev, pcm->config = config; pcm->flags = flags;
- dmaengine_pcm_request_chan_of(pcm, dev->of_node); + dmaengine_pcm_request_chan_of(pcm, dev);
if (flags & SND_DMAENGINE_PCM_FLAG_NO_RESIDUE) return snd_soc_add_platform(dev, &pcm->platform,
On Tue, Apr 23, 2013 at 05:54:33PM +0200, Arnd Bergmann wrote:
The exported interface for device drivers is dma_request_slave_channel, not of_dma_request_slave_channel. The former does not depend on device tree but also works with ACPI and other interfaces providing an abstraction for DMA channels.
This fixes link errors when building ALSA as a loadable module.
This has already been changed separately, I'm surprised this applies against current code. Though one does have to wonder why it's in the header file if it's not a supported API...
On Tue, Apr 23, 2013 at 05:54:33PM +0200, Arnd Bergmann wrote:
The exported interface for device drivers is dma_request_slave_channel, not of_dma_request_slave_channel. The former does not depend on device tree but also works with ACPI and other interfaces providing an abstraction for DMA channels.
This fixes link errors when building ALSA as a loadable module.
Signed-off-by: Arnd Bergmann arnd@arndb.de
I had already sent a similar patch [1] for that.
Shawn
[1] http://thread.gmane.org/gmane.linux.alsa.devel/107568/
Cc: alsa-devel@alsa-project.org Cc: Lars-Peter Clausen lars@metafoo.de Cc: Shawn Guo shawn.guo@linaro.org Cc: Mark Brown broonie@opensource.wolfsonmicro.com
sound/soc/soc-generic-dmaengine-pcm.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/sound/soc/soc-generic-dmaengine-pcm.c b/sound/soc/soc-generic-dmaengine-pcm.c index 5fd5ed4..8ee9859 100644 --- a/sound/soc/soc-generic-dmaengine-pcm.c +++ b/sound/soc/soc-generic-dmaengine-pcm.c @@ -219,19 +219,20 @@ static const char * const dmaengine_pcm_dma_channel_names[] = { };
static void dmaengine_pcm_request_chan_of(struct dmaengine_pcm *pcm,
- struct device_node *of_node)
- struct device *dev)
{ unsigned int i;
struct device_node *of_node = dev->of_node;
if ((pcm->flags & SND_DMAENGINE_PCM_FLAG_NO_DT) || !of_node) return;
if (pcm->flags & SND_DMAENGINE_PCM_FLAG_HALF_DUPLEX) {
pcm->chan[0] = of_dma_request_slave_channel(of_node, "tx_rx");
pcm->chan[0] = dma_request_slave_channel(dev, "tx_rx");
pcm->chan[i] = of_dma_request_slave_channel(of_node,
pcm->chan[i] = dma_request_slave_channel(dev, dmaengine_pcm_dma_channel_names[i]);@@ -255,7 +256,7 @@ int snd_dmaengine_pcm_register(struct device *dev, pcm->config = config; pcm->flags = flags;
- dmaengine_pcm_request_chan_of(pcm, dev->of_node);
dmaengine_pcm_request_chan_of(pcm, dev);
if (flags & SND_DMAENGINE_PCM_FLAG_NO_RESIDUE) return snd_soc_add_platform(dev, &pcm->platform,
-- 1.8.1.2
On Wednesday 24 April 2013, Shawn Guo wrote:
On Tue, Apr 23, 2013 at 05:54:33PM +0200, Arnd Bergmann wrote:
The exported interface for device drivers is dma_request_slave_channel, not of_dma_request_slave_channel. The former does not depend on device tree but also works with ACPI and other interfaces providing an abstraction for DMA channels.
This fixes link errors when building ALSA as a loadable module.
Signed-off-by: Arnd Bergmann arnd@arndb.de
I had already sent a similar patch [1] for that.
Yes, I see it in linux-next now.
Thanks,
Arnd
participants (3)
-
Arnd Bergmann -
Mark Brown -
Shawn Guo