[PATCH] uml: remove spinlock wrapper functions

The irq_spinlock is not needed from user code any more, so the irq_lock and
irq_unlock wrappers can go away.  This also changes the name of the lock to
irq_lock.

Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

2 files changed, 16 insertions, 31 deletions

diff --git a/arch/um/include/irq_user.h b/arch/um/include/irq_user.h
index 09e9e38920d5..15d311b9be9e 100644
--- a/arch/um/include/irq_user.h
+++ b/arch/um/include/irq_user.h
@@ -29,8 +29,6 @@ extern void reactivate_fd(int fd, int irqnum);
 extern void deactivate_fd(int fd, int irqnum);
 extern int deactivate_all_fds(void);
 extern int activate_ipi(int fd, int pid);
-extern unsigned long irq_lock(void);
-extern void irq_unlock(unsigned long flags);
 
 #ifdef CONFIG_MODE_TT
 extern void forward_interrupts(int pid);
diff --git a/arch/um/kernel/irq.c b/arch/um/kernel/irq.c
index 519cdb0a7708..27bc58ad38fd 100644
--- a/arch/um/kernel/irq.c
+++ b/arch/um/kernel/irq.c
@@ -123,6 +123,8 @@ static void maybe_sigio_broken(int fd, int type)
         }
 }
 
+static DEFINE_SPINLOCK(irq_lock);
+
 int activate_fd(int irq, int fd, int type, void *dev_id)
 {
         struct pollfd *tmp_pfd;
@@ -166,7 +168,7 @@ int activate_fd(int irq, int fd, int type, void *dev_id)
          * this is called only from process context, and can be locked with
          * a semaphore.
          */
-        flags = irq_lock();
+        spin_lock_irqsave(&irq_lock, flags);
         for (irq_fd = active_fds; irq_fd != NULL; irq_fd = irq_fd->next) {
                 if ((irq_fd->fd == fd) && (irq_fd->type == type)) {
                         printk("Registering fd %d twice\n", fd);
@@ -199,7 +201,7 @@ int activate_fd(int irq, int fd, int type, void *dev_id)
                  * so we will not be able to put new pollfd struct to pollfds
                  * then we free the buffer tmp_fds and try again.
                  */
-                irq_unlock(flags);
+                spin_unlock_irqrestore(&irq_lock, flags);
                 kfree(tmp_pfd);
                 tmp_pfd = NULL;
 
@@ -207,14 +209,14 @@ int activate_fd(int irq, int fd, int type, void *dev_id)
                 if (tmp_pfd == NULL)
                         goto out_kfree;
 
-                flags = irq_lock();
+                spin_lock_irqsave(&irq_lock, flags);
         }
         /*-------------*/
 
         *last_irq_ptr = new_fd;
         last_irq_ptr = &new_fd->next;
 
-        irq_unlock(flags);
+        spin_unlock_irqrestore(&irq_lock, flags);
 
         /* This calls activate_fd, so it has to be outside the critical
          * section.
@@ -224,7 +226,7 @@ int activate_fd(int irq, int fd, int type, void *dev_id)
         return(0);
 
  out_unlock:
-        irq_unlock(flags);
+        spin_unlock_irqrestore(&irq_lock, flags);
  out_kfree:
         kfree(new_fd);
  out:
@@ -235,9 +237,9 @@ static void free_irq_by_cb(int (*test)(struct irq_fd *, void *), void *arg)
 {
         unsigned long flags;
 
-        flags = irq_lock();
+        spin_lock_irqsave(&irq_lock, flags);
         os_free_irq_by_cb(test, arg, active_fds, &last_irq_ptr);
-        irq_unlock(flags);
+        spin_unlock_irqrestore(&irq_lock, flags);
 }
 
 struct irq_and_dev {
@@ -304,14 +306,14 @@ void reactivate_fd(int fd, int irqnum)
         unsigned long flags;
         int i;
 
-        flags = irq_lock();
+        spin_lock_irqsave(&irq_lock, flags);
         irq = find_irq_by_fd(fd, irqnum, &i);
         if (irq == NULL) {
-                irq_unlock(flags);
+                spin_unlock_irqrestore(&irq_lock, flags);
                 return;
         }
         os_set_pollfd(i, irq->fd);
-        irq_unlock(flags);
+        spin_unlock_irqrestore(&irq_lock, flags);
 
         /* This calls activate_fd, so it has to be outside the critical
          * section.
@@ -325,13 +327,13 @@ void deactivate_fd(int fd, int irqnum)
         unsigned long flags;
         int i;
 
-        flags = irq_lock();
+        spin_lock_irqsave(&irq_lock, flags);
         irq = find_irq_by_fd(fd, irqnum, &i);
         if (irq == NULL)
                 goto out;
         os_set_pollfd(i, -1);
  out:
-        irq_unlock(flags);
+        spin_unlock_irqrestore(&irq_lock, flags);
 }
 
 int deactivate_all_fds(void)
@@ -357,7 +359,7 @@ void forward_interrupts(int pid)
         unsigned long flags;
         int err;
 
-        flags = irq_lock();
+        spin_lock_irqsave(&irq_lock, flags);
         for (irq = active_fds; irq != NULL; irq = irq->next) {
                 err = os_set_owner(irq->fd, pid);
                 if (err < 0) {
@@ -370,7 +372,7 @@ void forward_interrupts(int pid)
 
                 irq->pid = pid;
         }
-        irq_unlock(flags);
+        spin_unlock_irqrestore(&irq_lock, flags);
 }
 #endif
 
@@ -405,21 +407,6 @@ int um_request_irq(unsigned int irq, int fd, int type,
 EXPORT_SYMBOL(um_request_irq);
 EXPORT_SYMBOL(reactivate_fd);
 
-static DEFINE_SPINLOCK(irq_spinlock);
-
-unsigned long irq_lock(void)
-{
-        unsigned long flags;
-
-        spin_lock_irqsave(&irq_spinlock, flags);
-        return flags;
-}
-
-void irq_unlock(unsigned long flags)
-{
-        spin_unlock_irqrestore(&irq_spinlock, flags);
-}
-
 /* hw_interrupt_type must define (startup || enable) &&
  * (shutdown || disable) && end */
 static void dummy(unsigned int irq)