From ea6c50d9e22799f2a366185dfd57d6a623dfa950 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Camilla=20L=C3=B6wy?= <elmindreda@glfw.org>
Date: Tue, 4 Jul 2017 17:22:29 +0200
Subject: [PATCH] Cleanup

---
 src/cocoa_joystick.m | 48 ++++++++++++++++++--------------------------
 1 file changed, 20 insertions(+), 28 deletions(-)

diff --git a/src/cocoa_joystick.m b/src/cocoa_joystick.m
index 81c7e2dc..05745720 100644
--- a/src/cocoa_joystick.m
+++ b/src/cocoa_joystick.m
@@ -196,39 +196,31 @@ static void matchCallback(void* context,
         }
 
         CFMutableArrayRef target = NULL;
+
         const uint32_t usage = IOHIDElementGetUsage(native);
-
-        switch (IOHIDElementGetUsagePage(native))
+        const uint32_t page = IOHIDElementGetUsagePage(native);
+        if (page == kHIDPage_GenericDesktop)
         {
-            case kHIDPage_GenericDesktop:
+            switch (usage)
             {
-                switch (usage)
-                {
-                    case kHIDUsage_GD_X:
-                    case kHIDUsage_GD_Y:
-                    case kHIDUsage_GD_Z:
-                    case kHIDUsage_GD_Rx:
-                    case kHIDUsage_GD_Ry:
-                    case kHIDUsage_GD_Rz:
-                    case kHIDUsage_GD_Slider:
-                    case kHIDUsage_GD_Dial:
-                    case kHIDUsage_GD_Wheel:
-                        target = axes;
-                        break;
-                    case kHIDUsage_GD_Hatswitch:
-                        target = hats;
-                        break;
-                }
-
-                break;
+                case kHIDUsage_GD_X:
+                case kHIDUsage_GD_Y:
+                case kHIDUsage_GD_Z:
+                case kHIDUsage_GD_Rx:
+                case kHIDUsage_GD_Ry:
+                case kHIDUsage_GD_Rz:
+                case kHIDUsage_GD_Slider:
+                case kHIDUsage_GD_Dial:
+                case kHIDUsage_GD_Wheel:
+                    target = axes;
+                    break;
+                case kHIDUsage_GD_Hatswitch:
+                    target = hats;
+                    break;
             }
-
-            case kHIDPage_Button:
-                target = buttons;
-                break;
-            default:
-                break;
         }
+        else if (page == kHIDPage_Button)
+            target = buttons;
 
         if (target)
         {