Merge tag 'v4.2-rc3' into next

[cascardo/linux.git] / drivers / input / joydev.c

diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c
index 1d247bc..6cb5a3e 100644 (file)
--- a/drivers/input/joydev.c
+++ b/drivers/input/joydev.c
@@ -859,12 +859,11 @@ static int joydev_connect(struct input_handler *handler, struct input_dev *dev,
        joydev->handle.handler = handler;
        joydev->handle.private = joydev;
 
-       for (i = 0; i < ABS_CNT; i++)
-               if (test_bit(i, dev->absbit)) {
-                       joydev->absmap[i] = joydev->nabs;
-                       joydev->abspam[joydev->nabs] = i;
-                       joydev->nabs++;
-               }
+       for_each_set_bit(i, dev->absbit, ABS_CNT) {
+               joydev->absmap[i] = joydev->nabs;
+               joydev->abspam[joydev->nabs] = i;
+               joydev->nabs++;
+       }
 
        for (i = BTN_JOYSTICK - BTN_MISC; i < KEY_MAX - BTN_MISC + 1; i++)
                if (test_bit(i + BTN_MISC, dev->keybit)) {