From 57f7bafb9dc8dfa597ed6744e5c72a1ced769904 Mon Sep 17 00:00:00 2001 From: Daniel Walker Date: Thu, 17 Jan 2008 21:50:36 -0800 Subject: [PATCH] arm: omap1: nokia770 semaphore to mutex The audio_pwr_sem conforms to the new mutex API. This patch converts the semaphore to the new API along with all the locking locations. I also changed the name to reflect the new type. Signed-off-by: Daniel Walker Signed-off-by: Tony Lindgren --- arch/arm/mach-omap1/board-nokia770.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/arch/arm/mach-omap1/board-nokia770.c b/arch/arm/mach-omap1/board-nokia770.c index e96d05e36bc..08f533eced7 100644 --- a/arch/arm/mach-omap1/board-nokia770.c +++ b/arch/arm/mach-omap1/board-nokia770.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #include @@ -244,7 +245,7 @@ static struct omap_board_config_kernel nokia770_config[] __initdata = { #define AMPLIFIER_CTRL_GPIO 58 static struct clk *dspxor_ck; -static DECLARE_MUTEX(audio_pwr_sem); +static DEFINE_MUTEX(audio_pwr_mutex); /* * audio_pwr_state * +--+-------------------------+---------------------------------------+ @@ -260,7 +261,7 @@ static DECLARE_MUTEX(audio_pwr_sem); static int audio_pwr_state = -1; /* - * audio_pwr_up / down should be called under audio_pwr_sem + * audio_pwr_up / down should be called under audio_pwr_mutex */ static void nokia770_audio_pwr_up(void) { @@ -279,11 +280,11 @@ static void nokia770_audio_pwr_up(void) static void codec_delayed_power_down(struct work_struct *work) { - down(&audio_pwr_sem); + mutex_lock(&audio_pwr_mutex); if (audio_pwr_state == -1) aic23_power_down(); clk_disable(dspxor_ck); - up(&audio_pwr_sem); + mutex_unlock(&audio_pwr_mutex); } static DECLARE_DELAYED_WORK(codec_power_down_work, codec_delayed_power_down); @@ -300,19 +301,19 @@ static void nokia770_audio_pwr_down(void) static int nokia770_audio_pwr_up_request(struct dsp_kfunc_device *kdev, int stage) { - down(&audio_pwr_sem); + mutex_lock(&audio_pwr_mutex); if (audio_pwr_state == -1) nokia770_audio_pwr_up(); /* force audio_pwr_state = 0, even if it was 1. */ audio_pwr_state = 0; - up(&audio_pwr_sem); + mutex_unlock(&audio_pwr_mutex); return 0; } static int nokia770_audio_pwr_down_request(struct dsp_kfunc_device *kdev, int stage) { - down(&audio_pwr_sem); + mutex_lock(&audio_pwr_mutex); switch (stage) { case 1: if (audio_pwr_state == 0) @@ -325,7 +326,7 @@ nokia770_audio_pwr_down_request(struct dsp_kfunc_device *kdev, int stage) } break; } - up(&audio_pwr_sem); + mutex_unlock(&audio_pwr_mutex); return 0; } -- 2.41.1