Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

Pull input updates from Dmitry Torokhov:
 "A few drivers were updated with device tree bindings and others got a
  few small cleanups and fixes."

Fix trivial conflict in drivers/input/keyboard/omap-keypad.c due to
changes clashing with a whitespace cleanup.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (28 commits)
  Input: wacom - mark Intuos5 pad as in-prox when touching buttons
  Input: synaptics - adjust threshold for treating position values as negative
  Input: hgpk - use %*ph to dump small buffer
  Input: gpio_keys_polled - fix dt pdata->nbuttons
  Input: Add KD[GS]KBDIACRUC ioctls to the compatible list
  Input: omap-keypad - fixed formatting
  Input: tegra - move platform data header
  Input: wacom - add support for EMR on Cintiq 24HD touch
  Input: s3c2410_ts - make s3c_ts_pmops const
  Input: samsung-keypad - use of_get_child_count() helper
  Input: samsung-keypad - use of_match_ptr()
  Input: uinput - fix formatting
  Input: uinput - specify exact bit sizes on userspace APIs
  Input: uinput - mark failed submission requests as free
  Input: uinput - fix race that can block nonblocking read
  Input: uinput - return -EINVAL when read buffer size is too small
  Input: uinput - take event lock when fetching events from buffer
  Input: get rid of MATCH_BIT() macro
  Input: rotary-encoder - add DT bindings
  Input: rotary-encoder - constify platform data pointers
  ...

1 files changed, 26 insertions, 17 deletions

diff --git a/drivers/input/input.c b/drivers/input/input.c
index 5244f3d05b12..ace3f7c4226d 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -918,18 +918,10 @@ int input_set_keycode(struct input_dev *dev,
 }
 EXPORT_SYMBOL(input_set_keycode);
 
-#define MATCH_BIT(bit, max) \
-                for (i = 0; i < BITS_TO_LONGS(max); i++) \
-                        if ((id->bit[i] & dev->bit[i]) != id->bit[i]) \
-                                break; \
-                if (i != BITS_TO_LONGS(max)) \
-                        continue;
-
 static const struct input_device_id *input_match_device(struct input_handler *handler,
                                                         struct input_dev *dev)
 {
         const struct input_device_id *id;
-        int i;
 
         for (id = handler->id_table; id->flags || id->driver_info; id++) {
 
@@ -949,15 +941,32 @@ static const struct input_device_id *input_match_device(struct input_handler *ha
                         if (id->version != dev->id.version)
                                 continue;
 
-                MATCH_BIT(evbit,  EV_MAX);
-                MATCH_BIT(keybit, KEY_MAX);
-                MATCH_BIT(relbit, REL_MAX);
-                MATCH_BIT(absbit, ABS_MAX);
-                MATCH_BIT(mscbit, MSC_MAX);
-                MATCH_BIT(ledbit, LED_MAX);
-                MATCH_BIT(sndbit, SND_MAX);
-                MATCH_BIT(ffbit,  FF_MAX);
-                MATCH_BIT(swbit,  SW_MAX);
+                if (!bitmap_subset(id->evbit, dev->evbit, EV_MAX))
+                        continue;
+
+                if (!bitmap_subset(id->keybit, dev->keybit, KEY_MAX))
+                        continue;
+
+                if (!bitmap_subset(id->relbit, dev->relbit, REL_MAX))
+                        continue;
+
+                if (!bitmap_subset(id->absbit, dev->absbit, ABS_MAX))
+                        continue;
+
+                if (!bitmap_subset(id->mscbit, dev->mscbit, MSC_MAX))
+                        continue;
+
+                if (!bitmap_subset(id->ledbit, dev->ledbit, LED_MAX))
+                        continue;
+
+                if (!bitmap_subset(id->sndbit, dev->sndbit, SND_MAX))
+                        continue;
+
+                if (!bitmap_subset(id->ffbit, dev->ffbit, FF_MAX))
+                        continue;
+
+                if (!bitmap_subset(id->swbit, dev->swbit, SW_MAX))
+                        continue;
 
                 if (!handler->match || handler->match(handler, dev))
                         return id;