ARM: 5675/1: The semaphore is used as mutex so make it a mutex

The semaphore is used as mutex so make it a mutex.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Wan ZongShun <mcuos.com@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/arch/arm/mach-w90x900/mfp-w90p910.c b/arch/arm/mach-w90x900/mfp-w90p910.c
index e11a32b6856d7cea96b4289a269fa10dd8f35f3b..4533098a0ee4822379619409f7a9dfe575894d29 100644 (file)
--- a/arch/arm/mach-w90x900/mfp-w90p910.c
+++ b/arch/arm/mach-w90x900/mfp-w90p910.c
@@ -40,7 +40,7 @@
 #define ENI2C0         (0x01 << 14)
 #define ENI2C1         (0x01 << 16)
 
-static DECLARE_MUTEX(mfp_sem);
+static DEFINE_MUTEX(mfp_mutex);
 
 void mfp_set_groupf(struct device *dev)
 {
@@ -49,7 +49,7 @@ void mfp_set_groupf(struct device *dev)
 
        BUG_ON(!dev);
 
-       down(&mfp_sem);
+       mutex_lock(&mfp_mutex);
 
        dev_id = dev_name(dev);
 
@@ -62,7 +62,7 @@ void mfp_set_groupf(struct device *dev)
 
        __raw_writel(mfpen, REG_MFSEL);
 
-       up(&mfp_sem);
+       mutex_unlock(&mfp_mutex);
 }
 EXPORT_SYMBOL(mfp_set_groupf);
 
@@ -73,7 +73,7 @@ void mfp_set_groupc(struct device *dev)
 
        BUG_ON(!dev);
 
-       down(&mfp_sem);
+       mutex_lock(&mfp_mutex);
 
        dev_id = dev_name(dev);
 
@@ -92,7 +92,7 @@ void mfp_set_groupc(struct device *dev)
 
        __raw_writel(mfpen, REG_MFSEL);
 
-       up(&mfp_sem);
+       mutex_unlock(&mfp_mutex);
 }
 EXPORT_SYMBOL(mfp_set_groupc);
 
@@ -103,7 +103,7 @@ void mfp_set_groupi(struct device *dev)
 
        BUG_ON(!dev);
 
-       down(&mfp_sem);
+       mutex_lock(&mfp_mutex);
 
        dev_id = dev_name(dev);
 
@@ -120,7 +120,7 @@ void mfp_set_groupi(struct device *dev)
 
        __raw_writel(mfpen, REG_MFSEL);
 
-       up(&mfp_sem);
+       mutex_unlock(&mfp_mutex);
 }
 EXPORT_SYMBOL(mfp_set_groupi);
 
@@ -131,7 +131,7 @@ void mfp_set_groupg(struct device *dev)
 
        BUG_ON(!dev);
 
-       down(&mfp_sem);
+       mutex_lock(&mfp_mutex);
 
        dev_id = dev_name(dev);
 
@@ -152,7 +152,7 @@ void mfp_set_groupg(struct device *dev)
 
        __raw_writel(mfpen, REG_MFSEL);
 
-       up(&mfp_sem);
+       mutex_unlock(&mfp_mutex);
 }
 EXPORT_SYMBOL(mfp_set_groupg);