lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'for-2.6.37' into for-2.6.38

Browse Source
This commit is contained in:
Mark Brown
2010-11-29 18:33:47 +00:00
parent df0701bb86 39a545559f
commit 649e5fb033
5 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sound/soc/fsl/mpc8610_hpcd.c
View File

@@ -498,6 +498,7 @@ static int mpc8610_hpcd_probe(struct platform_device *pdev)
dev_err(&pdev->dev, "platform device add failed\n"); dev_err(&pdev->dev, "platform device add failed\n");
goto error; goto error;
} }
dev_set_drvdata(&pdev->dev, sound_device);
of_node_put(codec_np); of_node_put(codec_np);

1
sound/soc/fsl/p1022_ds.c
View File

@@ -498,6 +498,7 @@ static int p1022_ds_probe(struct platform_device *pdev)
dev_err(&pdev->dev, "platform device add failed\n"); dev_err(&pdev->dev, "platform device add failed\n");
goto error; goto error;
} }
dev_set_drvdata(&pdev->dev, sound_device);
of_node_put(codec_np); of_node_put(codec_np);

15
sound/soc/nuc900/nuc900-ac97.c
View File

@@ -49,7 +49,7 @@ static unsigned short nuc900_ac97_read(struct snd_ac97 *ac97,
mutex_lock(&ac97_mutex); mutex_lock(&ac97_mutex);
val = nuc900_checkready(); val = nuc900_checkready();
if (!!val) { if (val) {
dev_err(nuc900_audio->dev, "AC97 codec is not ready\n"); dev_err(nuc900_audio->dev, "AC97 codec is not ready\n");
goto out; goto out;
} }
@@ -102,7 +102,7 @@ static void nuc900_ac97_write(struct snd_ac97 *ac97, unsigned short reg,
mutex_lock(&ac97_mutex); mutex_lock(&ac97_mutex);
tmp = nuc900_checkready(); tmp = nuc900_checkready();
if (!!tmp) if (tmp)
dev_err(nuc900_audio->dev, "AC97 codec is not ready\n"); dev_err(nuc900_audio->dev, "AC97 codec is not ready\n");
/* clear the R_WB bit and write register index */ /* clear the R_WB bit and write register index */
@@ -149,7 +149,7 @@ static void nuc900_ac97_warm_reset(struct snd_ac97 *ac97)
udelay(100); udelay(100);
val = nuc900_checkready(); val = nuc900_checkready();
if (!!val) if (val)
dev_err(nuc900_audio->dev, "AC97 codec is not ready\n"); dev_err(nuc900_audio->dev, "AC97 codec is not ready\n");
mutex_unlock(&ac97_mutex); mutex_unlock(&ac97_mutex);
@@ -263,8 +263,7 @@ static int nuc900_ac97_trigger(struct snd_pcm_substream *substream,
return ret; return ret;
} }
static int nuc900_ac97_probe(struct platform_device *pdev, static int nuc900_ac97_probe(struct snd_soc_dai *dai)
struct snd_soc_dai *dai)
{ {
struct nuc900_audio *nuc900_audio = nuc900_ac97_data; struct nuc900_audio *nuc900_audio = nuc900_ac97_data;
unsigned long val; unsigned long val;
@@ -284,12 +283,12 @@ static int nuc900_ac97_probe(struct platform_device *pdev,
return 0; return 0;
} }
static void nuc900_ac97_remove(struct platform_device *pdev, static int nuc900_ac97_remove(struct snd_soc_dai *dai)
struct snd_soc_dai *dai)
{ {
struct nuc900_audio *nuc900_audio = nuc900_ac97_data; struct nuc900_audio *nuc900_audio = nuc900_ac97_data;
clk_disable(nuc900_audio->clk); clk_disable(nuc900_audio->clk);
return 0;
} }
static struct snd_soc_dai_ops nuc900_ac97_dai_ops = { static struct snd_soc_dai_ops nuc900_ac97_dai_ops = {
@@ -313,7 +312,7 @@ static struct snd_soc_dai_driver nuc900_ac97_dai = {
.channels_max = 2, .channels_max = 2,
}, },
.ops = &nuc900_ac97_dai_ops, .ops = &nuc900_ac97_dai_ops,
} };
static int __devinit nuc900_ac97_drvprobe(struct platform_device *pdev) static int __devinit nuc900_ac97_drvprobe(struct platform_device *pdev)
{ {

2
sound/soc/nuc900/nuc900-audio.h
View File

@@ -110,4 +110,6 @@ struct nuc900_audio {
}; };
extern struct nuc900_audio *nuc900_ac97_data;
#endif /*end _NUC900_AUDIO_H */ #endif /*end _NUC900_AUDIO_H */

2
sound/soc/nuc900/nuc900-pcm.c
View File

@@ -332,7 +332,7 @@ static struct snd_soc_platform_driver nuc900_soc_platform = {
.ops = &nuc900_dma_ops, .ops = &nuc900_dma_ops,
.pcm_new = nuc900_dma_new, .pcm_new = nuc900_dma_new,
.pcm_free = nuc900_dma_free_dma_buffers, .pcm_free = nuc900_dma_free_dma_buffers,
} };
static int __devinit nuc900_soc_platform_probe(struct platform_device *pdev) static int __devinit nuc900_soc_platform_probe(struct platform_device *pdev)
{ {