Merge branch 'for-4.17/multitouch' into for-linus

Pull Razer Blade Stealth support improvement and a few generic cleanups

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

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

diff --cc drivers/hid/hid-multitouch.c
index 2e1736ba2444d8b02cc9526606ce814af03c9735,6ae2d14146b3b22eb50ff2a94bdfcb4b2ba41d56..ba32f0172030f8401a3b507d0f4fa8a0738d7218
--- 1/drivers/hid/hid-multitouch.c
--- 2/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@@ -369,9 -379,7 +379,8 @@@ static const struct attribute_group mt_
  
  static void mt_get_feature(struct hid_device *hdev, struct hid_report *report)
  {
-       struct mt_device *td = hid_get_drvdata(hdev);
 -      int ret, size = hid_report_len(report);
 +      int ret;
 +      u32 size = hid_report_len(report);
        u8 *buf;
  
        /*

diff --cc include/linux/hid.h
Simple merge