Merge branch 'next' into for-linus

Prepare input updates for 5.19 merge window.

diff --combined drivers/input/input.c
index e5a668c,0e7f3d0..1365c9d
--- 1/drivers/input/input.c
--- 2/drivers/input/input.c
+++ b/drivers/input/input.c
@@@ -1793,8 -1793,6 +1793,6 @@@ EXPORT_SYMBOL(input_reset_device)
  
  static int input_inhibit_device(struct input_dev *dev)
  {
-       int ret = 0;
- 
        mutex_lock(&dev->mutex);
  
        if (dev->inhibited)
@@@ -1816,7 -1814,7 +1814,7 @@@
  
  out:
        mutex_unlock(&dev->mutex);
-       return ret;
+       return 0;
  }
  
  static int input_uninhibit_device(struct input_dev *dev)
@@@ -2337,6 -2335,12 +2335,6 @@@ int input_register_device(struct input_
        /* KEY_RESERVED is not supposed to be transmitted to userspace. */
        __clear_bit(KEY_RESERVED, dev->keybit);
  
 -      /* Buttonpads should not map BTN_RIGHT and/or BTN_MIDDLE. */
 -      if (test_bit(INPUT_PROP_BUTTONPAD, dev->propbit)) {
 -              __clear_bit(BTN_RIGHT, dev->keybit);
 -              __clear_bit(BTN_MIDDLE, dev->keybit);
 -      }
 -
        /* Make sure that bitmasks not mentioned in dev->evbit are clean. */
        input_cleanse_bitmasks(dev);