[PATCH 1/2] ALSA: Remove __devinit annotation for pxa2xx_ac97_hw_probe to fix section mismatch warning

[PATCH 1/2] ALSA: Remove __devinit annotation for pxa2xx_ac97_hw_probe to fix section mismatch warning

[Axel Lin]

This fixes below build warning:
WARNING: vmlinux.o(.text+0x1e632c): Section mismatch in reference from the function pxa2xx_ac97_probe() to the function .devinit.text:pxa2xx_ac97_hw_probe()
The function pxa2xx_ac97_probe() references
the function __devinit pxa2xx_ac97_hw_probe().
This is often because pxa2xx_ac97_probe lacks a __devinit
annotation or the annotation of pxa2xx_ac97_hw_probe is wrong.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
 sound/arm/pxa2xx-ac97-lib.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sound/arm/pxa2xx-ac97-lib.c b/sound/arm/pxa2xx-ac97-lib.c
index 0e9e822..5e926c4 100644
--- a/sound/arm/pxa2xx-ac97-lib.c
+++ b/sound/arm/pxa2xx-ac97-lib.c
@@ -313,7 +313,7 @@ int pxa2xx_ac97_hw_resume(void)
 EXPORT_SYMBOL_GPL(pxa2xx_ac97_hw_resume);
 #endif
 
-int __devinit pxa2xx_ac97_hw_probe(struct platform_device *dev)
+int pxa2xx_ac97_hw_probe(struct platform_device *dev)
 {
 	int ret;
 	pxa2xx_audio_ops_t *pdata = dev->dev.platform_data;
-- 
1.7.5.4

[PATCH 2/2] ALSA: pxa2xx-pcm: replace 0xffffffff with DMA_BIT_MASK macro

[Axel Lin]

Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
 sound/arm/pxa2xx-pcm.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sound/arm/pxa2xx-pcm.c b/sound/arm/pxa2xx-pcm.c
index 26422a3..cbe6374 100644
--- a/sound/arm/pxa2xx-pcm.c
+++ b/sound/arm/pxa2xx-pcm.c
@@ -80,7 +80,7 @@ static struct snd_pcm_ops pxa2xx_pcm_ops = {
 	.mmap		= pxa2xx_pcm_mmap,
 };
 
-static u64 pxa2xx_pcm_dmamask = 0xffffffff;
+static u64 pxa2xx_pcm_dmamask = DMA_BIT_MASK(32);
 
 int pxa2xx_pcm_new(struct snd_card *card, struct pxa2xx_pcm_client *client,
 		   struct snd_pcm **rpcm)
@@ -100,7 +100,7 @@ int pxa2xx_pcm_new(struct snd_card *card, struct pxa2xx_pcm_client *client,
 	if (!card->dev->dma_mask)
 		card->dev->dma_mask = &pxa2xx_pcm_dmamask;
 	if (!card->dev->coherent_dma_mask)
-		card->dev->coherent_dma_mask = 0xffffffff;
+		card->dev->coherent_dma_mask = DMA_BIT_MASK(32);
 
 	if (play) {
 		int stream = SNDRV_PCM_STREAM_PLAYBACK;
-- 
1.7.5.4

[PATCH 1/2] ALSA: Remove __devinit annotation for pxa2xx_ac97_hw_probe to fix section mismatch warning

[Mark Brown]

On Sun, Feb 19, 2012 at 03:39:18PM +0800, Axel Lin wrote:
> This fixes below build warning:
> WARNING: vmlinux.o(.text+0x1e632c): Section mismatch in reference from the function pxa2xx_ac97_probe() to the function .devinit.text:pxa2xx_ac97_hw_probe()
> The function pxa2xx_ac97_probe() references
> the function __devinit pxa2xx_ac97_hw_probe().
> This is often because pxa2xx_ac97_probe lacks a __devinit
> annotation or the annotation of pxa2xx_ac97_hw_probe is wrong.

This seems like the wrong fix - shouldn't we be adding annotations
rather than removing them here?

[PATCH 1/2] ALSA: Remove __devinit annotation for pxa2xx_ac97_hw_probe to fix section mismatch warning

[Axel Lin]

2012/2/20 Mark Brown <broonie@opensource.wolfsonmicro.com>:
> On Sun, Feb 19, 2012 at 03:39:18PM +0800, Axel Lin wrote:
>> This fixes below build warning:
>> WARNING: vmlinux.o(.text+0x1e632c): Section mismatch in reference from the function pxa2xx_ac97_probe() to the function .devinit.text:pxa2xx_ac97_hw_probe()
>> The function pxa2xx_ac97_probe() references
>> the function __devinit pxa2xx_ac97_hw_probe().
>> This is often because pxa2xx_ac97_probe lacks a __devinit
>> annotation or the annotation of pxa2xx_ac97_hw_probe is wrong.
>
> This seems like the wrong fix - shouldn't we be adding annotations
> rather than removing them here?
I'll send a new patch to fix it. Thanks.
The change now is in sound/soc/pxa/pxa2xx-ac97.c, so I change the subject to:
[PATCH] ASoC: Add __devinit annotation for pxa2xx_ac97_probe

Axel