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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (34 commits)
  HID: roccat: Update sysfs attribute doc
  HID: roccat: don't use #pragma pack
  HID: roccat: Add support for Roccat Kone[+] v2
  HID: roccat: reduce number of functions in kone and pyra drivers
  HID: roccat: declare meaning of pack pragma usage in driver headers
  HID: roccat: use class for char device for sysfs attribute creation
  sysfs: Introducing binary attributes for struct class
  HID: hidraw: add compatibility ioctl() for 32-bit applications.
  HID: hid-picolcd: Fix memory leak in picolcd_debug_out_report()
  HID: picolcd: fix misuse of logical operation in place of bitop
  HID: usbhid: base runtime PM on modern API
  HID: replace offsets values with their corresponding BTN_* defines
  HID: hid-mosart: support suspend/resume
  HID: hid-mosart: ignore buttons report
  HID: hid-picolcd: don't use flush_scheduled_work()
  HID: simplify an index check in hid_lookup_collection
  HID: Hoist assigns from ifs
  HID: Remove superfluous __inline__
  HID: Use vzalloc for vmalloc/memset(,0...)
  HID: Add and use hid_<level>: dev_<level> equivalents
  ...

1 files changed, 9 insertions, 9 deletions

diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
index d8d372bae3cc..e60fdb88101f 100644
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@ -319,21 +319,21 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
 
                 switch (field->application) {
                 case HID_GD_MOUSE:
-                case HID_GD_POINTER:  code += 0x110; break;
+                case HID_GD_POINTER:  code += BTN_MOUSE; break;
                 case HID_GD_JOYSTICK:
                                 if (code <= 0xf)
                                         code += BTN_JOYSTICK;
                                 else
                                         code += BTN_TRIGGER_HAPPY;
                                 break;
-                case HID_GD_GAMEPAD:  code += 0x130; break;
+                case HID_GD_GAMEPAD:  code += BTN_GAMEPAD; break;
                 default:
                         switch (field->physical) {
                         case HID_GD_MOUSE:
-                        case HID_GD_POINTER:  code += 0x110; break;
-                        case HID_GD_JOYSTICK: code += 0x120; break;
-                        case HID_GD_GAMEPAD:  code += 0x130; break;
-                        default:              code += 0x100;
+                        case HID_GD_POINTER:  code += BTN_MOUSE; break;
+                        case HID_GD_JOYSTICK: code += BTN_JOYSTICK; break;
+                        case HID_GD_GAMEPAD:  code += BTN_GAMEPAD; break;
+                        default:              code += BTN_MISC;
                         }
                 }
 
@@ -817,14 +817,14 @@ static int hidinput_open(struct input_dev *dev)
 {
         struct hid_device *hid = input_get_drvdata(dev);
 
-        return hid->ll_driver->open(hid);
+        return hid_hw_open(hid);
 }
 
 static void hidinput_close(struct input_dev *dev)
 {
         struct hid_device *hid = input_get_drvdata(dev);
 
-        hid->ll_driver->close(hid);
+        hid_hw_close(hid);
 }
 
 /*
@@ -871,7 +871,7 @@ int hidinput_connect(struct hid_device *hid, unsigned int force)
                                 if (!hidinput || !input_dev) {
                                         kfree(hidinput);
                                         input_free_device(input_dev);
-                                        err_hid("Out of memory during hid input probe");
+                                        hid_err(hid, "Out of memory during hid input probe\n");
                                         goto out_unwind;
                                 }