[ARM] Convert some arm semaphores to mutexes

The arm clock semaphores are strict mutexes, convert them to the new
mutex implementation

Signed-off-by: Arjan van de Ven <arjan@infradead.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 8 insertions, 7 deletions

diff --git a/arch/arm/common/rtctime.c b/arch/arm/common/rtctime.c
index 72b03f201eb9..00f6278f42b8 100644
--- a/arch/arm/common/rtctime.c
+++ b/arch/arm/common/rtctime.c
@@ -18,6 +18,7 @@
 #include <linux/miscdevice.h>
 #include <linux/spinlock.h>
 #include <linux/device.h>
+#include <linux/mutex.h>
 
 #include <asm/rtc.h>
 #include <asm/semaphore.h>
@@ -34,7 +35,7 @@ static unsigned long rtc_irq_data;
 /*
  * rtc_sem protects rtc_inuse and rtc_ops
  */
-static DECLARE_MUTEX(rtc_sem);
+static DEFINE_MUTEX(rtc_mutex);
 static unsigned long rtc_inuse;
 static struct rtc_ops *rtc_ops;
 
@@ -355,7 +356,7 @@ static int rtc_open(struct inode *inode, struct file *file)
 {
         int ret;
 
-        down(&rtc_sem);
+        mutex_lock(&rtc_mutex);
 
         if (rtc_inuse) {
                 ret = -EBUSY;
@@ -373,7 +374,7 @@ static int rtc_open(struct inode *inode, struct file *file)
                         rtc_inuse = 1;
                 }
         }
-        up(&rtc_sem);
+        mutex_unlock(&rtc_mutex);
 
         return ret;
 }
@@ -479,7 +480,7 @@ int register_rtc(struct rtc_ops *ops)
 {
         int ret = -EBUSY;
 
-        down(&rtc_sem);
+        mutex_lock(&rtc_mutex);
         if (rtc_ops == NULL) {
                 rtc_ops = ops;
 
@@ -488,7 +489,7 @@ int register_rtc(struct rtc_ops *ops)
                         create_proc_read_entry("driver/rtc", 0, NULL,
                                                rtc_read_proc, ops);
         }
-        up(&rtc_sem);
+        mutex_unlock(&rtc_mutex);
 
         return ret;
 }
@@ -496,12 +497,12 @@ EXPORT_SYMBOL(register_rtc);
 
 void unregister_rtc(struct rtc_ops *rtc)
 {
-        down(&rtc_sem);
+        mutex_lock(&rtc_mutex);
         if (rtc == rtc_ops) {
                 remove_proc_entry("driver/rtc", NULL);
                 misc_deregister(&rtc_miscdev);
                 rtc_ops = NULL;
         }
-        up(&rtc_sem);
+        mutex_unlock(&rtc_mutex);
 }
 EXPORT_SYMBOL(unregister_rtc);