diff options
| author | Philippe Langlais <philippe.langlais@linaro.org> | 2011-03-28 17:02:47 +0200 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@stericsson.com> | 2011-09-19 15:14:44 +0200 |
| commit | 89cc6ae594fc339af434e2c4e557ca5b3864cb80 (patch) | |
| tree | 9a132d0b58f19817db119a427533fd2991b5a487 | |
| parent | 69b7421db8eac1e3bb6a26954ff20dc79435d471 (diff) | |
sound: replace init_MUTEX() by sema_init() and fix MODULE_LICENSE for 2.6.38
Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
| -rw-r--r-- | sound/arm/u8500_alsa_ab8500.c | 2 | ||||
| -rw-r--r-- | sound/arm/u8500_alsa_hdmi.c | 2 | ||||
| -rw-r--r-- | sound/soc/codecs/ab3550.c | 2 | ||||
| -rw-r--r-- | sound/soc/codecs/av8100_audio.c | 2 | ||||
| -rw-r--r-- | sound/soc/codecs/cg29xx.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/sound/arm/u8500_alsa_ab8500.c b/sound/arm/u8500_alsa_ab8500.c index 56c54b6c80c..39752388ab1 100644 --- a/sound/arm/u8500_alsa_ab8500.c +++ b/sound/arm/u8500_alsa_ab8500.c @@ -1950,7 +1950,7 @@ static int snd_u8500_alsa_pcm_open(struct snd_pcm_substream *substream) if (DISABLE == chip->direct_rendering_mode) { stm_config_hw(chip, substream, ALSA_PCM_DEV, stream_id); } - init_MUTEX(&(ptr_audio_stream->alsa_sem)); + sema_init(&(ptr_audio_stream->alsa_sem), 1); init_completion(&(ptr_audio_stream->alsa_com)); ptr_audio_stream->state = ALSA_STATE_UNPAUSE; diff --git a/sound/arm/u8500_alsa_hdmi.c b/sound/arm/u8500_alsa_hdmi.c index dfadc1ee624..dcbc3583ba7 100644 --- a/sound/arm/u8500_alsa_hdmi.c +++ b/sound/arm/u8500_alsa_hdmi.c @@ -324,7 +324,7 @@ static int snd_u8500_alsa_hdmi_open(struct snd_pcm_substream *substream) ptr_audio_stream->substream = substream; stm_config_hw(chip, substream, ALSA_HDMI_DEV, stream_id); - init_MUTEX(&(ptr_audio_stream->alsa_sem)); + sema_init(&(ptr_audio_stream->alsa_sem), 1); init_completion(&(ptr_audio_stream->alsa_com)); ptr_audio_stream->state = ALSA_STATE_UNPAUSE; diff --git a/sound/soc/codecs/ab3550.c b/sound/soc/codecs/ab3550.c index f5acd2b07d5..c2251c6b7d6 100644 --- a/sound/soc/codecs/ab3550.c +++ b/sound/soc/codecs/ab3550.c @@ -1425,4 +1425,4 @@ module_exit(ab3550_codec_platform_drv_exit); MODULE_DESCRIPTION("AB3550 Codec driver"); MODULE_AUTHOR("Xie Xiaolei <xie.xiaolei@stericsson.com>"); -MODULE_LICENSE("GPLv2"); +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/codecs/av8100_audio.c b/sound/soc/codecs/av8100_audio.c index 6fa6261c9fd..b403ec767be 100644 --- a/sound/soc/codecs/av8100_audio.c +++ b/sound/soc/codecs/av8100_audio.c @@ -448,4 +448,4 @@ static void __exit av8100_codec_platform_drv_exit(void) module_init(av8100_codec_platform_drv_init); module_exit(av8100_codec_platform_drv_exit); -MODULE_LICENSE("GPLv2"); +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/codecs/cg29xx.c b/sound/soc/codecs/cg29xx.c index 574c697ef42..56b23be8e97 100644 --- a/sound/soc/codecs/cg29xx.c +++ b/sound/soc/codecs/cg29xx.c @@ -771,4 +771,4 @@ static void __exit cg29xx_codec_platform_drv_exit(void) module_init(cg29xx_codec_platform_drv_init); module_exit(cg29xx_codec_platform_drv_exit); -MODULE_LICENSE("GPLv2"); +MODULE_LICENSE("GPL v2"); |