Commit 649e5fb033bbadbfa78aba5e2711f1faf2affaf0
Exists in
master
and in
39 other branches
Merge branch 'for-2.6.37' into for-2.6.38
Showing 5 changed files Side-by-side Diff
sound/soc/fsl/mpc8610_hpcd.c
sound/soc/fsl/p1022_ds.c
sound/soc/nuc900/nuc900-ac97.c
... | ... | @@ -49,7 +49,7 @@ |
49 | 49 | mutex_lock(&ac97_mutex); |
50 | 50 | |
51 | 51 | val = nuc900_checkready(); |
52 | - if (!!val) { | |
52 | + if (val) { | |
53 | 53 | dev_err(nuc900_audio->dev, "AC97 codec is not ready\n"); |
54 | 54 | goto out; |
55 | 55 | } |
... | ... | @@ -102,7 +102,7 @@ |
102 | 102 | mutex_lock(&ac97_mutex); |
103 | 103 | |
104 | 104 | tmp = nuc900_checkready(); |
105 | - if (!!tmp) | |
105 | + if (tmp) | |
106 | 106 | dev_err(nuc900_audio->dev, "AC97 codec is not ready\n"); |
107 | 107 | |
108 | 108 | /* clear the R_WB bit and write register index */ |
... | ... | @@ -149,7 +149,7 @@ |
149 | 149 | udelay(100); |
150 | 150 | |
151 | 151 | val = nuc900_checkready(); |
152 | - if (!!val) | |
152 | + if (val) | |
153 | 153 | dev_err(nuc900_audio->dev, "AC97 codec is not ready\n"); |
154 | 154 | |
155 | 155 | mutex_unlock(&ac97_mutex); |
... | ... | @@ -263,8 +263,7 @@ |
263 | 263 | return ret; |
264 | 264 | } |
265 | 265 | |
266 | -static int nuc900_ac97_probe(struct platform_device *pdev, | |
267 | - struct snd_soc_dai *dai) | |
266 | +static int nuc900_ac97_probe(struct snd_soc_dai *dai) | |
268 | 267 | { |
269 | 268 | struct nuc900_audio *nuc900_audio = nuc900_ac97_data; |
270 | 269 | unsigned long val; |
271 | 270 | |
... | ... | @@ -284,12 +283,12 @@ |
284 | 283 | return 0; |
285 | 284 | } |
286 | 285 | |
287 | -static void nuc900_ac97_remove(struct platform_device *pdev, | |
288 | - struct snd_soc_dai *dai) | |
286 | +static int nuc900_ac97_remove(struct snd_soc_dai *dai) | |
289 | 287 | { |
290 | 288 | struct nuc900_audio *nuc900_audio = nuc900_ac97_data; |
291 | 289 | |
292 | 290 | clk_disable(nuc900_audio->clk); |
291 | + return 0; | |
293 | 292 | } |
294 | 293 | |
295 | 294 | static struct snd_soc_dai_ops nuc900_ac97_dai_ops = { |
... | ... | @@ -313,7 +312,7 @@ |
313 | 312 | .channels_max = 2, |
314 | 313 | }, |
315 | 314 | .ops = &nuc900_ac97_dai_ops, |
316 | -} | |
315 | +}; | |
317 | 316 | |
318 | 317 | static int __devinit nuc900_ac97_drvprobe(struct platform_device *pdev) |
319 | 318 | { |
sound/soc/nuc900/nuc900-audio.h
sound/soc/nuc900/nuc900-pcm.c