Revert "HACK: input: evdev: disable EVIOCREVOKE"

This reverts commit 63995f379914bf529df9c429598e010144912bfd.

With the EVIOCSSUSPENDBLOCK ioctl patch dropped, there isn't
the need to disable EVIOCREVOKE anymore.

Change-Id: I2803b029170e249d6034539516a8adc40f026439
Signed-off-by: John Stultz <john.stultz@linaro.org>
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
index 43e1a82..e9ae3d5 100644
--- a/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
@@ -970,11 +970,6 @@
 	return 0;
 }
 
-/*
- * HACK: disable conflicting EVIOCREVOKE until Android userspace stops using
- * EVIOCSSUSPENDBLOCK
- */
-/*
 static int evdev_revoke(struct evdev *evdev, struct evdev_client *client,
 			struct file *file)
 {
@@ -985,7 +980,6 @@
 
 	return 0;
 }
-*/
 
 /* must be called with evdev-mutex held */
 static int evdev_set_mask(struct evdev_client *client,
@@ -1125,17 +1119,12 @@
 		else
 			return evdev_ungrab(evdev, client);
 
-	/*
-	 * HACK: disable conflicting EVIOCREVOKE until Android userspace stops
-	 * using EVIOCSSUSPENDBLOCK
-	 */
-	/*
 	case EVIOCREVOKE:
 		if (p)
 			return -EINVAL;
 		else
 			return evdev_revoke(evdev, client, file);
-	 */
+
 	case EVIOCGMASK: {
 		void __user *codes_ptr;
 
diff --git a/include/uapi/linux/input.h b/include/uapi/linux/input.h
index e5e2683..2758687 100644
--- a/include/uapi/linux/input.h
+++ b/include/uapi/linux/input.h
@@ -159,9 +159,7 @@
 #define EVIOCGEFFECTS		_IOR('E', 0x84, int)			/* Report number of effects playable at the same time */
 
 #define EVIOCGRAB		_IOW('E', 0x90, int)			/* Grab/Release device */
-
-/* HACK: disable conflicting EVIOCREVOKE until Android userspace stops using EVIOCSSUSPENDBLOCK */
-/*#define EVIOCREVOKE		_IOW('E', 0x91, int)*/			/* Revoke device access */
+#define EVIOCREVOKE		_IOW('E', 0x91, int)			/* Revoke device access */
 
 /**
  * EVIOCGMASK - Retrieve current event mask