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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (62 commits)
  Input: atkbd - release previously reserved keycodes 248 - 254
  Input: add KEY_WPS_BUTTON definition
  Input: ads7846 - add regulator support
  Input: winbond-cir - fix suspend/resume
  Input: gamecon - use pr_err() and friends
  Input: gamecon - constify some of the setup structures
  Input: gamecon - simplify pad type handling
  Input: gamecon - simplify coordinate calculation for PSX
  Input: gamecon - fix some formatting issues
  Input: gamecon - add rumble support for N64 pads
  Input: wacom - add device type to device name string
  Input: s3c24xx_ts - report touch only when stylus is down
  Input: s3c24xx_ts - re-enable IRQ on resume
  Input: wacom - constify product features data
  Input: wacom - use per-device instance of wacom_features
  Input: sh_keysc - enable building on SH-Mobile ARM
  Input: wacom - get features from driver info
  Input: rotary-encoder - set gpio direction for each requested gpio
  Input: sh_keysc - update the driver with mode 6
  Input: sh_keysc - switch to using bitmaps
  ...

1 files changed, 13 insertions, 4 deletions

diff --git a/include/linux/input.h b/include/linux/input.h
index f44ee9114401..dc24effb6d0e 100644
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -378,7 +378,7 @@ struct input_absinfo {
 #define KEY_WIMAX               246
 #define KEY_RFKILL              247     /* Key that controls all radios */
 
-/* Range 248 - 255 is reserved for special needs of AT keyboard driver */
+/* Code 255 is reserved for special needs of AT keyboard driver */
 
 #define BTN_MISC                0x100
 #define BTN_0                   0x100
@@ -597,6 +597,7 @@ struct input_absinfo {
 #define KEY_NUMERIC_POUND       0x20b
 
 #define KEY_CAMERA_FOCUS        0x210
+#define KEY_WPS_BUTTON          0x211   /* WiFi Protected Setup key */
 
 #define BTN_TRIGGER_HAPPY               0x2c0
 #define BTN_TRIGGER_HAPPY1              0x2c0
@@ -1242,6 +1243,10 @@ struct input_handle;
  * @event: event handler. This method is being called by input core with
  *      interrupts disabled and dev->event_lock spinlock held and so
  *      it may not sleep
+ * @filter: similar to @event; separates normal event handlers from
+ *      "filters".
+ * @match: called after comparing device's id with handler's id_table
+ *      to perform fine-grained matching between device and handler
  * @connect: called when attaching a handler to an input device
  * @disconnect: disconnects a handler from input device
  * @start: starts handler for given handle. This function is called by
@@ -1253,8 +1258,6 @@ struct input_handle;
  * @name: name of the handler, to be shown in /proc/bus/input/handlers
  * @id_table: pointer to a table of input_device_ids this driver can
  *      handle
- * @blacklist: pointer to a table of input_device_ids this driver should
- *      ignore even if they match @id_table
  * @h_list: list of input handles associated with the handler
  * @node: for placing the driver onto input_handler_list
  *
@@ -1263,6 +1266,11 @@ struct input_handle;
  * same time. All of them will get their copy of input event generated by
  * the device.
  *
+ * The very same structure is used to implement input filters. Input core
+ * allows filters to run first and will not pass event to regular handlers
+ * if any of the filters indicate that the event should be filtered (by
+ * returning %true from their filter() method).
+ *
  * Note that input core serializes calls to connect() and disconnect()
  * methods.
  */
@@ -1271,6 +1279,8 @@ struct input_handler {
         void *private;
 
         void (*event)(struct input_handle *handle, unsigned int type, unsigned int code, int value);
+        bool (*filter)(struct input_handle *handle, unsigned int type, unsigned int code, int value);
+        bool (*match)(struct input_handler *handler, struct input_dev *dev);
         int (*connect)(struct input_handler *handler, struct input_dev *dev, const struct input_device_id *id);
         void (*disconnect)(struct input_handle *handle);
         void (*start)(struct input_handle *handle);
@@ -1280,7 +1290,6 @@ struct input_handler {
         const char *name;
 
         const struct input_device_id *id_table;
-        const struct input_device_id *blacklist;
 
         struct list_head        h_list;
         struct list_head        node;