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: (29 commits)
  Input: i8042 - add Dell Vostro 1510 to nomux list
  Input: gtco - use USB endpoint API
  Input: add support for Maple controller as a joystick
  Input: atkbd - broaden the Dell DMI signatures
  Input: HIL drivers - add MODULE_ALIAS()
  Input: map_to_7segment.h - convert to __inline__ for userspace
  Input: add support for enhanced rotary controller on pxa930 and pxa935
  Input: add support for trackball on pxa930 and pxa935
  Input: add da9034 touchscreen support
  Input: ads7846 - strict_strtoul takes unsigned long
  Input: make some variables and functions static
  Input: add tsc2007 based touchscreen driver
  Input: psmouse - add module parameters to control OLPC touchpad delays
  Input: i8042 - add Gigabyte M912 netbook to noloop exception table
  Input: atkbd - Samsung NC10 key repeat fix
  Input: atkbd - add keyboard quirk for HP Pavilion ZV6100 laptop
  Input: libps2 - handle 0xfc responses from devices
  Input: add support for Wacom W8001 penabled serial touchscreen
  Input: synaptics - report multi-taps only if supported by the device
  Input: add joystick driver for Walkera WK-0701 RC transmitter
  ...

diff --combined drivers/input/keyboard/omap-keypad.c
index db22fd9b4cf2ca29243035e48ae1312d1dd341ed,ec0ebee46069f1062f33301dfcb25b949c8494f9..3f3d1198cdb10dd76fb4973766ab9d6e1908d246
--- 1/drivers/input/keyboard/omap-keypad.c
--- 2/drivers/input/keyboard/omap-keypad.c
+++ b/drivers/input/keyboard/omap-keypad.c
@@@ -101,7 -101,7 +101,7 @@@ static irqreturn_t omap_kp_interrupt(in
        if (cpu_is_omap24xx()) {
                int i;
                for (i = 0; i < omap_kp->rows; i++)
 -                      disable_irq(OMAP_GPIO_IRQ(row_gpios[i]));
 +                      disable_irq(gpio_to_irq(row_gpios[i]));
        } else
                /* disable keyboard interrupt and schedule for handling */
                omap_writew(1, OMAP_MPUIO_BASE + OMAP_MPUIO_KBD_MASKIT);
@@@ -122,14 -122,10 +122,10 @@@ static void omap_kp_scan_keypad(struct 
  
        /* read the keypad status */
        if (cpu_is_omap24xx()) {
-               int i;
-               for (i = 0; i < omap_kp->rows; i++)
-                       disable_irq(OMAP_GPIO_IRQ(row_gpios[i]));
- 
                /* read the keypad status */
                for (col = 0; col < omap_kp->cols; col++) {
                        set_col_gpio_val(omap_kp, ~(1 << col));
-                       state[col] = ~(get_row_gpio_val(omap_kp)) & 0x3f;
+                       state[col] = ~(get_row_gpio_val(omap_kp)) & 0xff;
                }
                set_col_gpio_val(omap_kp, 0);
  
@@@ -224,7 -220,7 +220,7 @@@ static void omap_kp_tasklet(unsigned lo
                if (cpu_is_omap24xx()) {
                        int i;
                        for (i = 0; i < omap_kp_data->rows; i++)
 -                              enable_irq(OMAP_GPIO_IRQ(row_gpios[i]));
 +                              enable_irq(gpio_to_irq(row_gpios[i]));
                } else {
                        omap_writew(0, OMAP_MPUIO_BASE + OMAP_MPUIO_KBD_MASKIT);
                        kp_cur_group = -1;
@@@ -397,7 -393,7 +393,7 @@@ static int __init omap_kp_probe(struct 
                omap_writew(0, OMAP_MPUIO_BASE + OMAP_MPUIO_KBD_MASKIT);
        } else {
                for (irq_idx = 0; irq_idx < omap_kp->rows; irq_idx++) {
 -                      if (request_irq(OMAP_GPIO_IRQ(row_gpios[irq_idx]),
 +                      if (request_irq(gpio_to_irq(row_gpios[irq_idx]),
                                        omap_kp_interrupt,
                                        IRQF_TRIGGER_FALLING,
                                        "omap-keypad", omap_kp) < 0)
@@@ -438,7 -434,7 +434,7 @@@ static int omap_kp_remove(struct platfo
                        gpio_free(col_gpios[i]);
                for (i = 0; i < omap_kp->rows; i++) {
                        gpio_free(row_gpios[i]);
 -                      free_irq(OMAP_GPIO_IRQ(row_gpios[i]), 0);
 +                      free_irq(gpio_to_irq(row_gpios[i]), 0);
                }
        } else {
                omap_writew(1, OMAP_MPUIO_BASE + OMAP_MPUIO_KBD_MASKIT);

diff --combined drivers/input/touchscreen/ads7846.c
index e1ece89fe9222b5ef810516ca0ea7384fd98eb2e,d0004dc44c86c4f62d65dfdae354177372e95529..7c27c8b9b6d0e1b8d23199f584332119b541ba06
--- 1/drivers/input/touchscreen/ads7846.c
--- 2/drivers/input/touchscreen/ads7846.c
+++ b/drivers/input/touchscreen/ads7846.c
@@@ -472,7 -472,7 +472,7 @@@ static ssize_t ads7846_disable_store(st
                                     const char *buf, size_t count)
  {
        struct ads7846 *ts = dev_get_drvdata(dev);
-       long i;
+       unsigned long i;
  
        if (strict_strtoul(buf, 10, &i))
                return -EINVAL;
@@@ -559,7 -559,7 +559,7 @@@ static void ads7846_rx(void *ads
        if (packet->tc.ignore || Rt > ts->pressure_max) {
  #ifdef VERBOSE
                pr_debug("%s: ignored %d pressure %d\n",
-                       ts->spi->dev.bus_id, packet->tc.ignore, Rt);
+                       dev_name(&ts->spi->dev), packet->tc.ignore, Rt);
  #endif
                hrtimer_start(&ts->timer, ktime_set(0, TS_POLL_PERIOD),
                              HRTIMER_MODE_REL);
@@@ -697,7 -697,7 +697,7 @@@ static enum hrtimer_restart ads7846_tim
        struct ads7846  *ts = container_of(handle, struct ads7846, timer);
        int             status = 0;
  
 -      spin_lock_irq(&ts->lock);
 +      spin_lock(&ts->lock);
  
        if (unlikely(!get_pendown_state(ts) ||
                     device_suspended(&ts->spi->dev))) {
@@@ -728,7 -728,7 +728,7 @@@
                        dev_err(&ts->spi->dev, "spi_async --> %d\n", status);
        }
  
 -      spin_unlock_irq(&ts->lock);
 +      spin_unlock(&ts->lock);
        return HRTIMER_NORESTART;
  }
  
@@@ -947,7 -947,7 +947,7 @@@ static int __devinit ads7846_probe(stru
                ts->penirq_recheck_delay_usecs =
                                pdata->penirq_recheck_delay_usecs;
  
-       snprintf(ts->phys, sizeof(ts->phys), "%s/input0", spi->dev.bus_id);
+       snprintf(ts->phys, sizeof(ts->phys), "%s/input0", dev_name(&spi->dev));
  
        input_dev->name = "ADS784x Touchscreen";
        input_dev->phys = ts->phys;