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

Pull input updates from Dmitry Torokhov:

 - an update to Elan touchpad SMBus driver to fetch device parameters
   (size, resolution) while it is still in PS/2 mode, before switching
   over to SMBus, as in that mode some devices return garbage dimensions

 - update to iforce joystick driver

 - miscellaneous driver fixes

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (48 commits)
  Input: gpio_keys_polled - allow specifying name of input device
  Input: edt-ft5x06 - simplify event reporting code
  Input: max77650-onkey - add MODULE_ALIAS()
  Input: atmel_mxt_ts - fix leak in mxt_update_cfg()
  Input: synaptics - enable SMBUS on T480 thinkpad trackpad
  Input: atmel_mxt_ts - fix -Wunused-const-variable
  Input: joydev - extend absolute mouse detection
  HID: quirks: Refactor ELAN 400 and 401 handling
  Input: elan_i2c - export the device id whitelist
  Input: edt-ft5x06 - use get_unaligned_be16()
  Input: iforce - add the Saitek R440 Force Wheel
  Input: iforce - use unaligned accessors, where appropriate
  Input: iforce - drop couple of temps from transport code
  Input: iforce - drop bus type from iforce structure
  Input: iforce - use DMA-safe buffores for USB transfers
  Input: iforce - allow callers supply data buffer when fetching device IDs
  Input: iforce - only call iforce_process_packet() if initialized
  Input: iforce - signal command completion from transport code
  Input: iforce - do not combine arguments for iforce_process_packet()
  Input: iforce - factor out hat handling when parsing packets
  ...

diff --cc drivers/hid/hid-quirks.c
Simple merge

diff --cc drivers/input/joydev.c
Simple merge

diff --cc drivers/input/joystick/iforce/Kconfig
Simple merge

diff --cc drivers/input/joystick/iforce/Makefile
Simple merge

diff --cc drivers/input/joystick/iforce/iforce-ff.c
Simple merge

diff --cc drivers/input/joystick/iforce/iforce-main.c
index 55f5b7bb4cac9284128892670ea626f4d62eb6de,40eb65bfd57e715770c8d26dfbe675eb48d454d7..9a5f90da06ec0b2ae943cfab181acdb4d4dde4fd
--- 1/drivers/input/joystick/iforce/iforce-main.c
--- 2/drivers/input/joystick/iforce/iforce-main.c
+++ b/drivers/input/joystick/iforce/iforce-main.c
@@@ -7,8 -6,22 +7,9 @@@
   */
  
  /*
 - * This program is free software; you can redistribute it and/or modify
 - * it under the terms of the GNU General Public License as published by
 - * the Free Software Foundation; either version 2 of the License, or
 - * (at your option) any later version.
 - *
 - * This program is distributed in the hope that it will be useful,
 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 - * GNU General Public License for more details.
 - *
 - * You should have received a copy of the GNU General Public License
 - * along with this program; if not, write to the Free Software
 - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
   */
  
+ #include <asm/unaligned.h>
  #include "iforce.h"
  
  MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>, Johann Deneux <johann.deneux@gmail.com>");

diff --cc drivers/input/joystick/iforce/iforce-packets.c
index 42cd9730e4cc7efa7b7a6a4a66a245c8157fb5a4,76c4475740ab6f8368fe06cd846a16ba90b92d8a..b313e38b2c3a83436a514a7a241ec84d174e1052
--- 1/drivers/input/joystick/iforce/iforce-packets.c
--- 2/drivers/input/joystick/iforce/iforce-packets.c
+++ b/drivers/input/joystick/iforce/iforce-packets.c
@@@ -7,8 -6,22 +7,9 @@@
   */
  
  /*
 - * This program is free software; you can redistribute it and/or modify
 - * it under the terms of the GNU General Public License as published by
 - * the Free Software Foundation; either version 2 of the License, or
 - * (at your option) any later version.
 - *
 - * This program is distributed in the hope that it will be useful,
 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 - * GNU General Public License for more details.
 - *
 - * You should have received a copy of the GNU General Public License
 - * along with this program; if not, write to the Free Software
 - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
   */
  
+ #include <asm/unaligned.h>
  #include "iforce.h"
  
  static struct {

diff --cc drivers/input/joystick/iforce/iforce-serio.c
index 65a4fe26324fe752b7fc55100876cbb947ae9744,e7692a38591e981c3ca43bdfb32d175cf64f1397..bbe31e0b759fcfd032bf195eba6c7f8b7605f03f
--- 1/drivers/input/joystick/iforce/iforce-serio.c
--- 2/drivers/input/joystick/iforce/iforce-serio.c
+++ b/drivers/input/joystick/iforce/iforce-serio.c
@@@ -7,12 -6,41 +7,28 @@@
   */
  
  /*
 - * This program is free software; you can redistribute it and/or modify
 - * it under the terms of the GNU General Public License as published by
 - * the Free Software Foundation; either version 2 of the License, or
 - * (at your option) any later version.
 - *
 - * This program is distributed in the hope that it will be useful,
 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 - * GNU General Public License for more details.
 - *
 - * You should have received a copy of the GNU General Public License
 - * along with this program; if not, write to the Free Software
 - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
   */
  
+ #include <linux/serio.h>
  #include "iforce.h"
  
- void iforce_serial_xmit(struct iforce *iforce)
+ struct iforce_serio {
+       struct iforce iforce;
+ 
+       struct serio *serio;
+       int idx, pkt, len, id;
+       u8 csum;
+       u8 expect_packet;
+       u8 cmd_response[IFORCE_MAX_LENGTH];
+       u8 cmd_response_len;
+       u8 data_in[IFORCE_MAX_LENGTH];
+ };
+ 
+ static void iforce_serio_xmit(struct iforce *iforce)
  {
+       struct iforce_serio *iforce_serio = container_of(iforce,
+                                                        struct iforce_serio,
+                                                        iforce);
        unsigned char cs;
        int i;
        unsigned long flags;

diff --cc drivers/input/joystick/iforce/iforce-usb.c
index f1569ae8381bcb8f5a9e044e4f905c09056367af,75a2b0ea37b4589b9ff011ce9b82ead93391af52..ade376bfb79f5b5430db68741c6fd9068a0007c1
--- 1/drivers/input/joystick/iforce/iforce-usb.c
--- 2/drivers/input/joystick/iforce/iforce-usb.c
+++ b/drivers/input/joystick/iforce/iforce-usb.c
@@@ -7,12 -6,39 +7,26 @@@
   */
  
  /*
 - * This program is free software; you can redistribute it and/or modify
 - * it under the terms of the GNU General Public License as published by
 - * the Free Software Foundation; either version 2 of the License, or
 - * (at your option) any later version.
 - *
 - * This program is distributed in the hope that it will be useful,
 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 - * GNU General Public License for more details.
 - *
 - * You should have received a copy of the GNU General Public License
 - * along with this program; if not, write to the Free Software
 - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
   */
  
+ #include <linux/usb.h>
  #include "iforce.h"
  
- void iforce_usb_xmit(struct iforce *iforce)
+ struct iforce_usb {
+       struct iforce iforce;
+ 
+       struct usb_device *usbdev;
+       struct usb_interface *intf;
+       struct urb *irq, *out;
+ 
+       u8 data_in[IFORCE_MAX_LENGTH] ____cacheline_aligned;
+       u8 data_out[IFORCE_MAX_LENGTH] ____cacheline_aligned;
+ };
+ 
+ static void __iforce_usb_xmit(struct iforce *iforce)
  {
+       struct iforce_usb *iforce_usb = container_of(iforce, struct iforce_usb,
+                                                    iforce);
        int n, c;
        unsigned long flags;
  

diff --cc drivers/input/joystick/iforce/iforce.h
Simple merge

diff --cc drivers/input/keyboard/gpio_keys.c
Simple merge

diff --cc drivers/input/keyboard/gpio_keys_polled.c
Simple merge

diff --cc drivers/input/misc/da9063_onkey.c
Simple merge

diff --cc drivers/input/mouse/elan_i2c_core.c
Simple merge

diff --cc drivers/input/mouse/elantech.c
Simple merge

diff --cc drivers/input/mouse/elantech.h
Simple merge

diff --cc drivers/input/mouse/synaptics.c
Simple merge

diff --cc drivers/input/rmi4/rmi_f12.c
Simple merge

diff --cc drivers/input/touchscreen/atmel_mxt_ts.c
Simple merge

diff --cc drivers/input/touchscreen/eeti_ts.c
Simple merge