Merge branch 'next' into for-linus

Prepare input updates for 3.19.

71 files changed, 4850 insertions, 911 deletions

diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c
index e29c04e2aff4..e853a2134680 100644
--- a/drivers/input/gameport/gameport.c
+++ b/drivers/input/gameport/gameport.c
@@ -527,14 +527,14 @@ EXPORT_SYMBOL(gameport_set_phys);
  */
 static void gameport_init_port(struct gameport *gameport)
 {
-        static atomic_t gameport_no = ATOMIC_INIT(0);
+        static atomic_t gameport_no = ATOMIC_INIT(-1);
 
         __module_get(THIS_MODULE);
 
         mutex_init(&gameport->drv_mutex);
         device_initialize(&gameport->dev);
         dev_set_name(&gameport->dev, "gameport%lu",
-                        (unsigned long)atomic_inc_return(&gameport_no) - 1);
+                        (unsigned long)atomic_inc_return(&gameport_no));
         gameport->dev.bus = &gameport_bus;
         gameport->dev.release = gameport_release_port;
         if (gameport->parent)
diff --git a/drivers/input/input.c b/drivers/input/input.c
index 0f175f55782b..04217c2e345c 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -1775,7 +1775,7 @@ EXPORT_SYMBOL_GPL(input_class);
  */
 struct input_dev *input_allocate_device(void)
 {
-        static atomic_t input_no = ATOMIC_INIT(0);
+        static atomic_t input_no = ATOMIC_INIT(-1);
         struct input_dev *dev;
 
         dev = kzalloc(sizeof(struct input_dev), GFP_KERNEL);
@@ -1790,7 +1790,7 @@ struct input_dev *input_allocate_device(void)
                 INIT_LIST_HEAD(&dev->node);
 
                 dev_set_name(&dev->dev, "input%lu",
-                             (unsigned long) atomic_inc_return(&input_no) - 1);
+                             (unsigned long)atomic_inc_return(&input_no));
 
                 __module_get(THIS_MODULE);
         }
diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index fc55f0d15b70..3aa2f3f3da5b 100644
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -886,8 +886,8 @@ static void xpad_led_set(struct led_classdev *led_cdev,
 
 static int xpad_led_probe(struct usb_xpad *xpad)
 {
-        static atomic_t led_seq = ATOMIC_INIT(0);
-        long led_no;
+        static atomic_t led_seq = ATOMIC_INIT(-1);
+        unsigned long led_no;
         struct xpad_led *led;
         struct led_classdev *led_cdev;
         int error;
@@ -899,9 +899,9 @@ static int xpad_led_probe(struct usb_xpad *xpad)
         if (!led)
                 return -ENOMEM;
 
-        led_no = (long)atomic_inc_return(&led_seq) - 1;
+        led_no = atomic_inc_return(&led_seq);
 
-        snprintf(led->name, sizeof(led->name), "xpad%ld", led_no);
+        snprintf(led->name, sizeof(led->name), "xpad%lu", led_no);
         led->xpad = xpad;