[PATCH 7/9] drm/nouveau: Fold nouveau_event_put_locked into caller

[Peter Hurley]

nouveau_event_put_locked() only has 1 call site; fold into caller.

Signed-off-by: Peter Hurley <peter at hurleysoftware.com>
---
 drivers/gpu/drm/nouveau/core/core/event.c | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/drivers/gpu/drm/nouveau/core/core/event.c 
b/drivers/gpu/drm/nouveau/core/core/event.c
index ce0a0ef..45bcb37 100644
--- a/drivers/gpu/drm/nouveau/core/core/event.c
+++ b/drivers/gpu/drm/nouveau/core/core/event.c
@@ -100,18 +100,6 @@ nouveau_event_handler_destroy(struct nouveau_event *event, 
int index,
        kfree_rcu(handler, rcu);
 }

-static void
-nouveau_event_put_locked(struct nouveau_event *event, int index,
-                        struct nouveau_eventh *handler)
-{
-       if (__test_and_clear_bit(NVKM_EVENT_ENABLE, &handler->flags)) {
-               if (!--event->index[index].refs) {
-                       if (event->disable)
-                               event->disable(event, index);
-               }
-       }
-}
-
 void
 nouveau_event_put(struct nouveau_event *event, int index,
                  struct nouveau_eventh *handler)
@@ -122,7 +110,12 @@ nouveau_event_put(struct nouveau_event *event, int index,
                return;

        spin_lock_irqsave(&event->lock, flags);
-       nouveau_event_put_locked(event, index, handler);
+       if (__test_and_clear_bit(NVKM_EVENT_ENABLE, &handler->flags)) {
+               if (!--event->index[index].refs) {
+                       if (event->disable)
+                               event->disable(event, index);
+               }
+       }
        spin_unlock_irqrestore(&event->lock, flags);
 }

-- 
1.8.1.2