Merge branch 'for-3.15/hid-core-ll-transport-cleanup' into for-next

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

diff --cc drivers/hid/hid-sony.c
index 947d2088a70045e0dd322b1975284e78ad68d6ab,e3e89b6a41c28d9b18702e8c53e21218cb292840..3d6902d16890478ab74340f4483680a90c88edb0
--- 1/drivers/hid/hid-sony.c
--- 2/drivers/hid/hid-sony.c
+++ b/drivers/hid/hid-sony.c
@@@ -1054,21 -720,10 +1054,21 @@@ static int sixaxis_set_operational_usb(
  static int sixaxis_set_operational_bt(struct hid_device *hdev)
  {
        unsigned char buf[] = { 0xf4,  0x42, 0x03, 0x00, 0x00 };
-       return hid_output_raw_report(hdev, buf, sizeof(buf),
-                                    HID_FEATURE_REPORT);
+       return hid_hw_raw_request(hdev, buf[0], buf, sizeof(buf),
+                                 HID_FEATURE_REPORT, HID_REQ_SET_REPORT);
  }
  
 +/* Requesting feature report 0x02 in Bluetooth mode changes the state of the
 + * controller so that it sends full input reports of type 0x11.
 + */
 +static int dualshock4_set_operational_bt(struct hid_device *hdev)
 +{
 +      __u8 buf[37] = { 0 };
 +
 +      return hid_hw_raw_request(hdev, 0x02, buf, sizeof(buf),
 +                              HID_FEATURE_REPORT, HID_REQ_GET_REPORT);
 +}
 +
  static void buzz_set_leds(struct hid_device *hdev, const __u8 *leds)
  {
        struct list_head *report_list =

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