* [PATCH 0/7] hid driver transport cleanup
@ 2013-02-08 14:37 Benjamin Tissoires
2013-02-08 14:37 ` [PATCH 1/7] HID: Extend the interface with report requests Benjamin Tissoires
` (9 more replies)
0 siblings, 10 replies; 24+ messages in thread
From: Benjamin Tissoires @ 2013-02-08 14:37 UTC (permalink / raw)
To: Benjamin Tissoires, Dmitry Torokhov, Henrik Rydberg, Jiri Kosina,
Stephane Chatty, linux-input, linux-kernel
Hi guys,
so, here is the hid drivers cleanup. The aim is to remove as much as possible
direct calls to usbhid for hid drivers. Thus, other transport layers can use
the existing hid drivers (like I2C or uhid).
Henrik, patches 1 to 5 are yours. I just rebased and double-checked them. Please
add you Signed-off-by if you are happy with the rebase.
Patches applies on top of Jiri's for-next branch.
Cheers,
Benjamin
Benjamin Tissoires (7):
HID: Extend the interface with report requests
HID: Extend the interface with wait io request
HID: Kconfig: Remove explicit transport layer dependencies
hid: use hid_hw_request() instead of direct call to usbhid
HID: use hid_hw_wait() instead of direct call to usbhid
HID: multitouch: remove usbhid dependency
HID: multitouch: Copyright and note on regression tests
drivers/hid/Kconfig | 98 ++++++++++++++++++-------------------
drivers/hid/hid-apple.c | 1 -
drivers/hid/hid-axff.c | 6 +--
drivers/hid/hid-dr.c | 8 ++-
drivers/hid/hid-emsff.c | 6 +--
drivers/hid/hid-gaff.c | 10 ++--
drivers/hid/hid-holtekff.c | 4 +-
drivers/hid/hid-kye.c | 4 +-
drivers/hid/hid-lenovo-tpkbd.c | 4 +-
drivers/hid/hid-lg2ff.c | 6 +--
drivers/hid/hid-lg3ff.c | 6 +--
drivers/hid/hid-lg4ff.c | 18 +++----
drivers/hid/hid-lgff.c | 8 ++-
drivers/hid/hid-logitech-dj.c | 3 +-
drivers/hid/hid-magicmouse.c | 1 -
drivers/hid/hid-multitouch.c | 21 ++++++--
drivers/hid/hid-ntrig.c | 10 ++--
drivers/hid/hid-picolcd.h | 4 +-
drivers/hid/hid-picolcd_backlight.c | 4 +-
drivers/hid/hid-picolcd_cir.c | 2 -
drivers/hid/hid-picolcd_core.c | 8 ++-
drivers/hid/hid-picolcd_debugfs.c | 2 -
drivers/hid/hid-picolcd_fb.c | 12 ++---
drivers/hid/hid-picolcd_lcd.c | 4 +-
drivers/hid/hid-picolcd_leds.c | 4 +-
drivers/hid/hid-pl.c | 6 +--
drivers/hid/hid-prodikeys.c | 3 +-
drivers/hid/hid-sensor-hub.c | 12 ++---
drivers/hid/hid-sjoy.c | 6 +--
drivers/hid/hid-speedlink.c | 2 -
drivers/hid/hid-steelseries.c | 3 +-
drivers/hid/hid-tmff.c | 6 +--
drivers/hid/hid-zpff.c | 6 +--
drivers/hid/usbhid/hid-core.c | 20 ++++++--
drivers/hid/usbhid/hid-pidff.c | 80 +++++++++++++++---------------
drivers/hid/usbhid/hiddev.c | 8 +--
drivers/hid/usbhid/usbhid.h | 3 --
include/linux/hid.h | 34 +++++++++++++
38 files changed, 224 insertions(+), 219 deletions(-)
--
1.8.1
^ permalink raw reply [flat|nested] 24+ messages in thread* [PATCH 1/7] HID: Extend the interface with report requests 2013-02-08 14:37 [PATCH 0/7] hid driver transport cleanup Benjamin Tissoires @ 2013-02-08 14:37 ` Benjamin Tissoires 2013-02-15 19:46 ` Henrik Rydberg 2013-02-08 14:37 ` [PATCH 2/7] HID: Extend the interface with wait io request Benjamin Tissoires ` (8 subsequent siblings) 9 siblings, 1 reply; 24+ messages in thread From: Benjamin Tissoires @ 2013-02-08 14:37 UTC (permalink / raw) To: Benjamin Tissoires, Dmitry Torokhov, Henrik Rydberg, Jiri Kosina, Stephane Chatty, linux-input, linux-kernel Some drivers send reports directly to underlying device, creating an unwanted dependency on the underlying transport layer. This patch adds hid_hw_request() to the interface, thereby removing usbhid from the lion share of the drivers. Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com> --- drivers/hid/usbhid/hid-core.c | 13 +++++++++++++ include/linux/hid.h | 20 ++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c index 8e0c4bf94..366fd09 100644 --- a/drivers/hid/usbhid/hid-core.c +++ b/drivers/hid/usbhid/hid-core.c @@ -1243,6 +1243,18 @@ static int usbhid_power(struct hid_device *hid, int lvl) return r; } +static void usbhid_request(struct hid_device *hid, struct hid_report *rep, int reqtype) +{ + switch (reqtype) { + case HID_REQ_GET_REPORT: + usbhid_submit_report(hid, rep, USB_DIR_IN); + break; + case HID_REQ_SET_REPORT: + usbhid_submit_report(hid, rep, USB_DIR_OUT); + break; + } +} + static struct hid_ll_driver usb_hid_driver = { .parse = usbhid_parse, .start = usbhid_start, @@ -1251,6 +1263,7 @@ static struct hid_ll_driver usb_hid_driver = { .close = usbhid_close, .power = usbhid_power, .hidinput_input_event = usb_hidinput_input_event, + .request = usbhid_request, }; static int usbhid_probe(struct usb_interface *intf, const struct usb_device_id *id) diff --git a/include/linux/hid.h b/include/linux/hid.h index e14b465..261c713 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h @@ -662,6 +662,7 @@ struct hid_driver { * @hidinput_input_event: event input event (e.g. ff or leds) * @parse: this method is called only once to parse the device data, * shouldn't allocate anything to not leak memory + * @request: send report request to device (e.g. feature report) */ struct hid_ll_driver { int (*start)(struct hid_device *hdev); @@ -676,6 +677,10 @@ struct hid_ll_driver { unsigned int code, int value); int (*parse)(struct hid_device *hdev); + + void (*request)(struct hid_device *hdev, + struct hid_report *report, int reqtype); + }; #define PM_HINT_FULLON 1<<5 @@ -883,6 +888,21 @@ static inline int hid_hw_power(struct hid_device *hdev, int level) return hdev->ll_driver->power ? hdev->ll_driver->power(hdev, level) : 0; } + +/** + * hid_hw_request - send report request to device + * + * @hdev: hid device + * @report: report to send + * @reqtype: hid request type + */ +static inline void hid_hw_request(struct hid_device *hdev, + struct hid_report *report, int reqtype) +{ + if (hdev->ll_driver->request) + hdev->ll_driver->request(hdev, report, reqtype); +} + int hid_report_raw_event(struct hid_device *hid, int type, u8 *data, int size, int interrupt); -- 1.8.1 ^ permalink raw reply related [flat|nested] 24+ messages in thread
* Re: [PATCH 1/7] HID: Extend the interface with report requests 2013-02-08 14:37 ` [PATCH 1/7] HID: Extend the interface with report requests Benjamin Tissoires @ 2013-02-15 19:46 ` Henrik Rydberg 0 siblings, 0 replies; 24+ messages in thread From: Henrik Rydberg @ 2013-02-15 19:46 UTC (permalink / raw) To: Benjamin Tissoires Cc: Dmitry Torokhov, Jiri Kosina, Stephane Chatty, linux-input, linux-kernel On Fri, Feb 08, 2013 at 03:37:30PM +0100, Benjamin Tissoires wrote: > Some drivers send reports directly to underlying device, creating an > unwanted dependency on the underlying transport layer. This patch adds > hid_hw_request() to the interface, thereby removing usbhid from the > lion share of the drivers. > > Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com> > --- > drivers/hid/usbhid/hid-core.c | 13 +++++++++++++ > include/linux/hid.h | 20 ++++++++++++++++++++ > 2 files changed, 33 insertions(+) Signed-off-by: Henrik Rydberg <rydberg@euromail.se> Thanks, Benjamin. Henrik ^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH 2/7] HID: Extend the interface with wait io request 2013-02-08 14:37 [PATCH 0/7] hid driver transport cleanup Benjamin Tissoires 2013-02-08 14:37 ` [PATCH 1/7] HID: Extend the interface with report requests Benjamin Tissoires @ 2013-02-08 14:37 ` Benjamin Tissoires 2013-02-15 20:47 ` Henrik Rydberg 2013-02-08 14:37 ` [PATCH 3/7] HID: Kconfig: Remove explicit transport layer dependencies Benjamin Tissoires ` (7 subsequent siblings) 9 siblings, 1 reply; 24+ messages in thread From: Benjamin Tissoires @ 2013-02-08 14:37 UTC (permalink / raw) To: Benjamin Tissoires, Dmitry Torokhov, Henrik Rydberg, Jiri Kosina, Stephane Chatty, linux-input, linux-kernel Some drivers need to wait for an io from the underlying device, creating an unwanted dependency on the underlying transport layer. This patch adds wait() to the interface, thereby removing usbhid from the lion share of the drivers. Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com> --- drivers/hid/usbhid/hid-core.c | 1 + include/linux/hid.h | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c index 366fd09..99d95d3 100644 --- a/drivers/hid/usbhid/hid-core.c +++ b/drivers/hid/usbhid/hid-core.c @@ -1264,6 +1264,7 @@ static struct hid_ll_driver usb_hid_driver = { .power = usbhid_power, .hidinput_input_event = usb_hidinput_input_event, .request = usbhid_request, + .wait = usbhid_wait_io, }; static int usbhid_probe(struct usb_interface *intf, const struct usb_device_id *id) diff --git a/include/linux/hid.h b/include/linux/hid.h index 261c713..7071eb3 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h @@ -663,6 +663,7 @@ struct hid_driver { * @parse: this method is called only once to parse the device data, * shouldn't allocate anything to not leak memory * @request: send report request to device (e.g. feature report) + * @wait: wait for buffered io to complete (send/recv reports) */ struct hid_ll_driver { int (*start)(struct hid_device *hdev); @@ -681,6 +682,8 @@ struct hid_ll_driver { void (*request)(struct hid_device *hdev, struct hid_report *report, int reqtype); + int (*wait)(struct hid_device *hdev); + }; #define PM_HINT_FULLON 1<<5 @@ -903,6 +906,17 @@ static inline void hid_hw_request(struct hid_device *hdev, hdev->ll_driver->request(hdev, report, reqtype); } +/** + * hid_hw_wait - wait for buffered io to complete + * + * @hdev: hid device + */ +static inline void hid_hw_wait(struct hid_device *hdev) +{ + if (hdev->ll_driver->wait) + hdev->ll_driver->wait(hdev); +} + int hid_report_raw_event(struct hid_device *hid, int type, u8 *data, int size, int interrupt); -- 1.8.1 ^ permalink raw reply related [flat|nested] 24+ messages in thread
* Re: [PATCH 2/7] HID: Extend the interface with wait io request 2013-02-08 14:37 ` [PATCH 2/7] HID: Extend the interface with wait io request Benjamin Tissoires @ 2013-02-15 20:47 ` Henrik Rydberg 0 siblings, 0 replies; 24+ messages in thread From: Henrik Rydberg @ 2013-02-15 20:47 UTC (permalink / raw) To: Benjamin Tissoires Cc: Dmitry Torokhov, Jiri Kosina, Stephane Chatty, linux-input, linux-kernel On Fri, Feb 08, 2013 at 03:37:31PM +0100, Benjamin Tissoires wrote: > Some drivers need to wait for an io from the underlying device, creating > an unwanted dependency on the underlying transport layer. This patch adds > wait() to the interface, thereby removing usbhid from the lion share of > the drivers. > > Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com> > --- > drivers/hid/usbhid/hid-core.c | 1 + > include/linux/hid.h | 14 ++++++++++++++ > 2 files changed, 15 insertions(+) Signed-off-by: Henrik Rydberg <rydberg@euromail.se> Thank you, Benjamin, Henrik ^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH 3/7] HID: Kconfig: Remove explicit transport layer dependencies 2013-02-08 14:37 [PATCH 0/7] hid driver transport cleanup Benjamin Tissoires 2013-02-08 14:37 ` [PATCH 1/7] HID: Extend the interface with report requests Benjamin Tissoires 2013-02-08 14:37 ` [PATCH 2/7] HID: Extend the interface with wait io request Benjamin Tissoires @ 2013-02-08 14:37 ` Benjamin Tissoires 2013-02-20 20:06 ` Henrik Rydberg 2013-02-08 14:37 ` [PATCH 4/7] hid: use hid_hw_request() instead of direct call to usbhid Benjamin Tissoires ` (6 subsequent siblings) 9 siblings, 1 reply; 24+ messages in thread From: Benjamin Tissoires @ 2013-02-08 14:37 UTC (permalink / raw) To: Benjamin Tissoires, Dmitry Torokhov, Henrik Rydberg, Jiri Kosina, Stephane Chatty, linux-input, linux-kernel Most HID drivers (rightfully) only depend on the HID bus, not the specific transport layer. Remove such dependencies where applicable. Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com> --- drivers/hid/Kconfig | 66 ++++++++++++++++++++++---------------------- drivers/hid/hid-apple.c | 1 - drivers/hid/hid-magicmouse.c | 1 - drivers/hid/hid-speedlink.c | 2 -- 4 files changed, 33 insertions(+), 37 deletions(-) diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index 69ab7c2..581ca9f 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -92,7 +92,7 @@ menu "Special HID drivers" config HID_A4TECH tristate "A4 tech mice" if EXPERT - depends on USB_HID + depends on HID default !EXPERT ---help--- Support for A4 tech X5 and WOP-35 / Trust 450L mice. @@ -113,7 +113,7 @@ config HID_ACRUX_FF config HID_APPLE tristate "Apple {i,Power,Mac}Books" if EXPERT - depends on (USB_HID || BT_HIDP) + depends on HID default !EXPERT ---help--- Support for some Apple devices which less or more break @@ -124,27 +124,27 @@ config HID_APPLE config HID_AUREAL tristate "Aureal" - depends on USB_HID + depends on HID ---help--- Support for Aureal Cy se W-01RN Remote Controller and other Aureal derived remotes. config HID_BELKIN tristate "Belkin Flip KVM and Wireless keyboard" if EXPERT - depends on USB_HID + depends on HID default !EXPERT ---help--- Support for Belkin Flip KVM and Wireless keyboard. config HID_CHERRY tristate "Cherry Cymotion keyboard" if EXPERT - depends on USB_HID + depends on HID default !EXPERT ---help--- Support for Cherry Cymotion keyboard. config HID_CHICONY tristate "Chicony Tactical pad" if EXPERT - depends on USB_HID + depends on HID default !EXPERT ---help--- Support for Chicony Tactical pad. @@ -166,7 +166,7 @@ config HID_PRODIKEYS config HID_CYPRESS tristate "Cypress mouse and barcode readers" if EXPERT - depends on USB_HID + depends on HID default !EXPERT ---help--- Support for cypress mouse and barcode readers. @@ -202,13 +202,13 @@ config HID_EMS_FF config HID_ELECOM tristate "ELECOM BM084 bluetooth mouse" - depends on BT_HIDP + depends on HID ---help--- Support for the ELECOM BM084 (bluetooth mouse). config HID_EZKEY tristate "Ezkey BTC 8193 keyboard" if EXPERT - depends on USB_HID + depends on HID default !EXPERT ---help--- Support for Ezkey BTC 8193 keyboard. @@ -231,7 +231,7 @@ config HOLTEK_FF config HID_KEYTOUCH tristate "Keytouch HID devices" - depends on USB_HID + depends on HID ---help--- Support for Keytouch HID devices not fully compliant with the specification. Currently supported: @@ -249,25 +249,25 @@ config HID_KYE config HID_UCLOGIC tristate "UC-Logic" - depends on USB_HID + depends on HID ---help--- Support for UC-Logic tablets. config HID_WALTOP tristate "Waltop" - depends on USB_HID + depends on HID ---help--- Support for Waltop tablets. config HID_GYRATION tristate "Gyration remote control" - depends on USB_HID + depends on HID ---help--- Support for Gyration remote control. config HID_ICADE tristate "ION iCade arcade controller" - depends on BT_HIDP + depends on HID ---help--- Support for the ION iCade arcade controller to work as a joystick. @@ -276,20 +276,20 @@ config HID_ICADE config HID_TWINHAN tristate "Twinhan IR remote control" - depends on USB_HID + depends on HID ---help--- Support for Twinhan IR remote control. config HID_KENSINGTON tristate "Kensington Slimblade Trackball" if EXPERT - depends on USB_HID + depends on HID default !EXPERT ---help--- Support for Kensington Slimblade Trackball. config HID_LCPOWER tristate "LC-Power" - depends on USB_HID + depends on HID ---help--- Support for LC-Power RC1000MCE RF remote control. @@ -308,7 +308,7 @@ config HID_LENOVO_TPKBD config HID_LOGITECH tristate "Logitech devices" if EXPERT - depends on USB_HID + depends on HID default !EXPERT ---help--- Support for Logitech devices that are not fully compliant with HID standard. @@ -374,7 +374,7 @@ config LOGIWHEELS_FF config HID_MAGICMOUSE tristate "Apple MagicMouse multi-touch support" - depends on BT_HIDP + depends on HID ---help--- Support for the Apple Magic Mouse multi-touch. @@ -383,14 +383,14 @@ config HID_MAGICMOUSE config HID_MICROSOFT tristate "Microsoft non-fully HID-compliant devices" if EXPERT - depends on USB_HID + depends on HID default !EXPERT ---help--- Support for Microsoft devices that are not fully compliant with HID standard. config HID_MONTEREY tristate "Monterey Genius KB29E keyboard" if EXPERT - depends on USB_HID + depends on HID default !EXPERT ---help--- Support for Monterey Genius KB29E. @@ -445,7 +445,7 @@ config HID_NTRIG config HID_ORTEK tristate "Ortek PKB-1700/WKB-2000/Skycable wireless keyboard and mouse trackpad" - depends on USB_HID + depends on HID ---help--- There are certain devices which have LogicalMaximum wrong in the keyboard usage page of their report descriptor. The most prevailing ones so far @@ -473,7 +473,7 @@ config PANTHERLORD_FF config HID_PETALYNX tristate "Petalynx Maxter remote control" - depends on USB_HID + depends on HID ---help--- Support for Petalynx Maxter remote control. @@ -545,14 +545,14 @@ config HID_PICOLCD_CIR config HID_PRIMAX tristate "Primax non-fully HID-compliant devices" - depends on USB_HID + depends on HID ---help--- Support for Primax devices that are not fully compliant with the HID standard. config HID_PS3REMOTE tristate "Sony PS3 BD Remote Control" - depends on BT_HIDP + depends on HID ---help--- Support for the Sony PS3 Blue-ray Disk Remote Control and Logitech Harmony Adapter for PS3, which connect over Bluetooth. @@ -569,7 +569,7 @@ config HID_ROCCAT config HID_SAITEK tristate "Saitek non-fully HID-compliant devices" - depends on USB_HID + depends on HID ---help--- Support for Saitek devices that are not fully compliant with the HID standard. @@ -578,7 +578,7 @@ config HID_SAITEK config HID_SAMSUNG tristate "Samsung InfraRed remote control or keyboards" - depends on USB_HID + depends on HID ---help--- Support for Samsung InfraRed remote control or keyboards. @@ -604,7 +604,7 @@ config HID_STEELSERIES config HID_SUNPLUS tristate "Sunplus wireless desktop" - depends on USB_HID + depends on HID ---help--- Support for Sunplus wireless desktop. @@ -650,13 +650,13 @@ config SMARTJOYPLUS_FF config HID_TIVO tristate "TiVo Slide Bluetooth remote control support" - depends on (USB_HID || BT_HIDP) + depends on HID ---help--- Say Y if you have a TiVo Slide Bluetooth remote control. config HID_TOPSEED tristate "TopSeed Cyberlink, BTC Emprex, Conceptronic remote control support" - depends on USB_HID + depends on HID ---help--- Say Y if you have a TopSeed Cyberlink or BTC Emprex or Conceptronic CLLRCMCE remote control. @@ -679,7 +679,7 @@ config THRUSTMASTER_FF config HID_WACOM tristate "Wacom Bluetooth devices support" - depends on BT_HIDP + depends on HID depends on LEDS_CLASS select POWER_SUPPLY ---help--- @@ -687,7 +687,7 @@ config HID_WACOM config HID_WIIMOTE tristate "Nintendo Wii Remote support" - depends on BT_HIDP + depends on HID depends on LEDS_CLASS select POWER_SUPPLY select INPUT_FF_MEMLESS @@ -719,7 +719,7 @@ config ZEROPLUS_FF config HID_ZYDACRON tristate "Zydacron remote control support" - depends on USB_HID + depends on HID ---help--- Support for Zydacron remote control. diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c index 320a958..9e0c4fbb 100644 --- a/drivers/hid/hid-apple.c +++ b/drivers/hid/hid-apple.c @@ -21,7 +21,6 @@ #include <linux/hid.h> #include <linux/module.h> #include <linux/slab.h> -#include <linux/usb.h> #include "hid-ids.h" diff --git a/drivers/hid/hid-magicmouse.c b/drivers/hid/hid-magicmouse.c index f7f113b..ef89573 100644 --- a/drivers/hid/hid-magicmouse.c +++ b/drivers/hid/hid-magicmouse.c @@ -19,7 +19,6 @@ #include <linux/input/mt.h> #include <linux/module.h> #include <linux/slab.h> -#include <linux/usb.h> #include "hid-ids.h" diff --git a/drivers/hid/hid-speedlink.c b/drivers/hid/hid-speedlink.c index e94371a..a2f587d 100644 --- a/drivers/hid/hid-speedlink.c +++ b/drivers/hid/hid-speedlink.c @@ -16,10 +16,8 @@ #include <linux/device.h> #include <linux/hid.h> #include <linux/module.h> -#include <linux/usb.h> #include "hid-ids.h" -#include "usbhid/usbhid.h" static const struct hid_device_id speedlink_devices[] = { { HID_USB_DEVICE(USB_VENDOR_ID_X_TENSIONS, USB_DEVICE_ID_SPEEDLINK_VAD_CEZANNE)}, -- 1.8.1 ^ permalink raw reply related [flat|nested] 24+ messages in thread
* Re: [PATCH 3/7] HID: Kconfig: Remove explicit transport layer dependencies 2013-02-08 14:37 ` [PATCH 3/7] HID: Kconfig: Remove explicit transport layer dependencies Benjamin Tissoires @ 2013-02-20 20:06 ` Henrik Rydberg 2013-02-25 10:15 ` Benjamin Tissoires 0 siblings, 1 reply; 24+ messages in thread From: Henrik Rydberg @ 2013-02-20 20:06 UTC (permalink / raw) To: Benjamin Tissoires Cc: Dmitry Torokhov, Jiri Kosina, Stephane Chatty, linux-input, linux-kernel Hi Benjamin, > Most HID drivers (rightfully) only depend on the HID bus, not the > specific transport layer. Remove such dependencies where applicable. > > Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com> > --- I suppose you checked this list against newcomers as well, so: Acked-by: Henrik Rydberg <rydberg@euromail.se> Thanks, Henrik ^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 3/7] HID: Kconfig: Remove explicit transport layer dependencies 2013-02-20 20:06 ` Henrik Rydberg @ 2013-02-25 10:15 ` Benjamin Tissoires 0 siblings, 0 replies; 24+ messages in thread From: Benjamin Tissoires @ 2013-02-25 10:15 UTC (permalink / raw) To: Henrik Rydberg Cc: Dmitry Torokhov, Jiri Kosina, Stephane Chatty, linux-input, linux-kernel Hi Henrik, On Wed, Feb 20, 2013 at 9:06 PM, Henrik Rydberg <rydberg@euromail.se> wrote: > Hi Benjamin, > >> Most HID drivers (rightfully) only depend on the HID bus, not the >> specific transport layer. Remove such dependencies where applicable. >> >> Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com> >> --- > > I suppose you checked this list against newcomers as well, so: > > Acked-by: Henrik Rydberg <rydberg@euromail.se> I checked, but a newcomer came since: thingM... I'll update the patch accordingly in the v2. Cheers, Benjamin ^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH 4/7] hid: use hid_hw_request() instead of direct call to usbhid 2013-02-08 14:37 [PATCH 0/7] hid driver transport cleanup Benjamin Tissoires ` (2 preceding siblings ...) 2013-02-08 14:37 ` [PATCH 3/7] HID: Kconfig: Remove explicit transport layer dependencies Benjamin Tissoires @ 2013-02-08 14:37 ` Benjamin Tissoires 2013-02-20 20:16 ` Henrik Rydberg 2013-02-08 14:37 ` [PATCH 5/7] HID: use hid_hw_wait() " Benjamin Tissoires ` (5 subsequent siblings) 9 siblings, 1 reply; 24+ messages in thread From: Benjamin Tissoires @ 2013-02-08 14:37 UTC (permalink / raw) To: Benjamin Tissoires, Dmitry Torokhov, Henrik Rydberg, Jiri Kosina, Stephane Chatty, linux-input, linux-kernel This allows the hid drivers to be independent from the transport layer. Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com> --- drivers/hid/Kconfig | 30 ++++++++--------- drivers/hid/hid-axff.c | 6 ++-- drivers/hid/hid-dr.c | 8 ++--- drivers/hid/hid-emsff.c | 6 ++-- drivers/hid/hid-gaff.c | 10 +++--- drivers/hid/hid-holtekff.c | 4 +-- drivers/hid/hid-kye.c | 4 +-- drivers/hid/hid-lenovo-tpkbd.c | 4 +-- drivers/hid/hid-lg2ff.c | 6 ++-- drivers/hid/hid-lg3ff.c | 6 ++-- drivers/hid/hid-lg4ff.c | 18 +++++------ drivers/hid/hid-lgff.c | 8 ++--- drivers/hid/hid-logitech-dj.c | 3 +- drivers/hid/hid-multitouch.c | 4 +-- drivers/hid/hid-ntrig.c | 6 ++-- drivers/hid/hid-picolcd.h | 4 +-- drivers/hid/hid-picolcd_backlight.c | 4 +-- drivers/hid/hid-picolcd_cir.c | 2 -- drivers/hid/hid-picolcd_core.c | 8 ++--- drivers/hid/hid-picolcd_debugfs.c | 2 -- drivers/hid/hid-picolcd_fb.c | 7 ++-- drivers/hid/hid-picolcd_lcd.c | 4 +-- drivers/hid/hid-picolcd_leds.c | 4 +-- drivers/hid/hid-pl.c | 6 ++-- drivers/hid/hid-prodikeys.c | 3 +- drivers/hid/hid-sensor-hub.c | 7 ++-- drivers/hid/hid-sjoy.c | 6 ++-- drivers/hid/hid-steelseries.c | 3 +- drivers/hid/hid-tmff.c | 6 ++-- drivers/hid/hid-zpff.c | 6 ++-- drivers/hid/usbhid/hid-core.c | 3 +- drivers/hid/usbhid/hid-pidff.c | 64 ++++++++++++++++++------------------- drivers/hid/usbhid/hiddev.c | 4 +-- drivers/hid/usbhid/usbhid.h | 2 -- 34 files changed, 111 insertions(+), 157 deletions(-) diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index 581ca9f..d60a427 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -99,7 +99,7 @@ config HID_A4TECH config HID_ACRUX tristate "ACRUX game controller support" - depends on USB_HID + depends on HID ---help--- Say Y here if you want to enable support for ACRUX game controllers. @@ -151,7 +151,7 @@ config HID_CHICONY config HID_PRODIKEYS tristate "Prodikeys PC-MIDI Keyboard support" - depends on USB_HID && SND + depends on HID && SND select SND_RAWMIDI ---help--- Support for Prodikeys PC-MIDI Keyboard device support. @@ -173,7 +173,7 @@ config HID_CYPRESS config HID_DRAGONRISE tristate "DragonRise Inc. game controller" - depends on USB_HID + depends on HID ---help--- Say Y here if you have DragonRise Inc. game controllers. These might be branded as: @@ -192,7 +192,7 @@ config DRAGONRISE_FF config HID_EMS_FF tristate "EMS Production Inc. force feedback support" - depends on USB_HID + depends on HID select INPUT_FF_MEMLESS ---help--- Say Y here if you want to enable force feedback support for devices by @@ -215,7 +215,7 @@ config HID_EZKEY config HID_HOLTEK tristate "Holtek HID devices" - depends on USB_HID + depends on HID ---help--- Support for Holtek based devices: - Holtek On Line Grip based game controller @@ -239,7 +239,7 @@ config HID_KEYTOUCH config HID_KYE tristate "KYE/Genius devices" - depends on USB_HID + depends on HID ---help--- Support for KYE/Genius devices not fully compliant with HID standard: - Ergo Mouse @@ -397,7 +397,7 @@ config HID_MONTEREY config HID_MULTITOUCH tristate "HID Multitouch panels" - depends on USB_HID + depends on HID ---help--- Generic support for HID multitouch panels. @@ -458,7 +458,7 @@ config HID_ORTEK config HID_PANTHERLORD tristate "Pantherlord/GreenAsia game controller" - depends on USB_HID + depends on HID ---help--- Say Y here if you have a PantherLord/GreenAsia based game controller or adapter. @@ -592,13 +592,13 @@ config HID_SONY config HID_SPEEDLINK tristate "Speedlink VAD Cezanne mouse support" - depends on USB_HID + depends on HID ---help--- Support for Speedlink Vicious and Divine Cezanne mouse. config HID_STEELSERIES tristate "Steelseries SRW-S1 steering wheel support" - depends on USB_HID + depends on HID ---help--- Support for Steelseries SRW-S1 steering wheel @@ -610,7 +610,7 @@ config HID_SUNPLUS config HID_GREENASIA tristate "GreenAsia (Product ID 0x12) game controller support" - depends on USB_HID + depends on HID ---help--- Say Y here if you have a GreenAsia (Product ID 0x12) based game controller or adapter. @@ -632,7 +632,7 @@ config HID_HYPERV_MOUSE config HID_SMARTJOYPLUS tristate "SmartJoy PLUS PS2/USB adapter support" - depends on USB_HID + depends on HID ---help--- Support for SmartJoy PLUS PS2/USB adapter, Super Dual Box, Super Joy Box 3 Pro, Super Dual Box Pro, and Super Joy Box 5 Pro. @@ -663,7 +663,7 @@ config HID_TOPSEED config HID_THRUSTMASTER tristate "ThrustMaster devices support" - depends on USB_HID + depends on HID ---help--- Say Y here if you have a THRUSTMASTER FireStore Dual Power 2 or a THRUSTMASTER Ferrari GT Rumble Wheel. @@ -705,7 +705,7 @@ config HID_WIIMOTE_EXT config HID_ZEROPLUS tristate "Zeroplus based game controller support" - depends on USB_HID + depends on HID ---help--- Say Y here if you have a Zeroplus based game controller. @@ -725,7 +725,7 @@ config HID_ZYDACRON config HID_SENSOR_HUB tristate "HID Sensors framework support" - depends on USB_HID && GENERIC_HARDIRQS + depends on HID && GENERIC_HARDIRQS select MFD_CORE default n -- help--- diff --git a/drivers/hid/hid-axff.c b/drivers/hid/hid-axff.c index 62f0cee..64ab94a 100644 --- a/drivers/hid/hid-axff.c +++ b/drivers/hid/hid-axff.c @@ -29,14 +29,12 @@ #include <linux/input.h> #include <linux/slab.h> -#include <linux/usb.h> #include <linux/hid.h> #include <linux/module.h> #include "hid-ids.h" #ifdef CONFIG_HID_ACRUX_FF -#include "usbhid/usbhid.h" struct axff_device { struct hid_report *report; @@ -68,7 +66,7 @@ static int axff_play(struct input_dev *dev, void *data, struct ff_effect *effect } dbg_hid("running with 0x%02x 0x%02x", left, right); - usbhid_submit_report(hid, axff->report, USB_DIR_OUT); + hid_hw_request(hid, axff->report, HID_REQ_SET_REPORT); return 0; } @@ -114,7 +112,7 @@ static int axff_init(struct hid_device *hid) goto err_free_mem; axff->report = report; - usbhid_submit_report(hid, axff->report, USB_DIR_OUT); + hid_hw_request(hid, axff->report, HID_REQ_SET_REPORT); hid_info(hid, "Force Feedback for ACRUX game controllers by Sergei Kolzun <x0r@dv-life.ru>\n"); diff --git a/drivers/hid/hid-dr.c b/drivers/hid/hid-dr.c index 0fe8f65..ce06444 100644 --- a/drivers/hid/hid-dr.c +++ b/drivers/hid/hid-dr.c @@ -29,14 +29,12 @@ #include <linux/input.h> #include <linux/slab.h> -#include <linux/usb.h> #include <linux/hid.h> #include <linux/module.h> #include "hid-ids.h" #ifdef CONFIG_DRAGONRISE_FF -#include "usbhid/usbhid.h" struct drff_device { struct hid_report *report; @@ -68,7 +66,7 @@ static int drff_play(struct input_dev *dev, void *data, drff->report->field[0]->value[1] = 0x00; drff->report->field[0]->value[2] = weak; drff->report->field[0]->value[4] = strong; - usbhid_submit_report(hid, drff->report, USB_DIR_OUT); + hid_hw_request(hid, drff->report, HID_REQ_SET_REPORT); drff->report->field[0]->value[0] = 0xfa; drff->report->field[0]->value[1] = 0xfe; @@ -80,7 +78,7 @@ static int drff_play(struct input_dev *dev, void *data, drff->report->field[0]->value[2] = 0x00; drff->report->field[0]->value[4] = 0x00; dbg_hid("running with 0x%02x 0x%02x", strong, weak); - usbhid_submit_report(hid, drff->report, USB_DIR_OUT); + hid_hw_request(hid, drff->report, HID_REQ_SET_REPORT); return 0; } @@ -132,7 +130,7 @@ static int drff_init(struct hid_device *hid) drff->report->field[0]->value[4] = 0x00; drff->report->field[0]->value[5] = 0x00; drff->report->field[0]->value[6] = 0x00; - usbhid_submit_report(hid, drff->report, USB_DIR_OUT); + hid_hw_request(hid, drff->report, HID_REQ_SET_REPORT); hid_info(hid, "Force Feedback for DragonRise Inc. " "game controllers by Richard Walmsley <richwalm@gmail.com>\n"); diff --git a/drivers/hid/hid-emsff.c b/drivers/hid/hid-emsff.c index 2e093ab..d82d75b 100644 --- a/drivers/hid/hid-emsff.c +++ b/drivers/hid/hid-emsff.c @@ -23,11 +23,9 @@ #include <linux/hid.h> #include <linux/input.h> -#include <linux/usb.h> #include <linux/module.h> #include "hid-ids.h" -#include "usbhid/usbhid.h" struct emsff_device { struct hid_report *report; @@ -52,7 +50,7 @@ static int emsff_play(struct input_dev *dev, void *data, emsff->report->field[0]->value[2] = strong; dbg_hid("running with 0x%02x 0x%02x\n", strong, weak); - usbhid_submit_report(hid, emsff->report, USB_DIR_OUT); + hid_hw_request(hid, emsff->report, HID_REQ_SET_REPORT); return 0; } @@ -104,7 +102,7 @@ static int emsff_init(struct hid_device *hid) emsff->report->field[0]->value[4] = 0x00; emsff->report->field[0]->value[5] = 0x00; emsff->report->field[0]->value[6] = 0x00; - usbhid_submit_report(hid, emsff->report, USB_DIR_OUT); + hid_hw_request(hid, emsff->report, HID_REQ_SET_REPORT); hid_info(hid, "force feedback for EMS based devices by Ignaz Forster <ignaz.forster@gmx.de>\n"); diff --git a/drivers/hid/hid-gaff.c b/drivers/hid/hid-gaff.c index 04d2e6a..2d8cead 100644 --- a/drivers/hid/hid-gaff.c +++ b/drivers/hid/hid-gaff.c @@ -29,13 +29,11 @@ #include <linux/input.h> #include <linux/slab.h> -#include <linux/usb.h> #include <linux/hid.h> #include <linux/module.h> #include "hid-ids.h" #ifdef CONFIG_GREENASIA_FF -#include "usbhid/usbhid.h" struct gaff_device { struct hid_report *report; @@ -63,14 +61,14 @@ static int hid_gaff_play(struct input_dev *dev, void *data, gaff->report->field[0]->value[4] = left; gaff->report->field[0]->value[5] = 0; dbg_hid("running with 0x%02x 0x%02x", left, right); - usbhid_submit_report(hid, gaff->report, USB_DIR_OUT); + hid_hw_request(hid, gaff->report, HID_REQ_SET_REPORT); gaff->report->field[0]->value[0] = 0xfa; gaff->report->field[0]->value[1] = 0xfe; gaff->report->field[0]->value[2] = 0x0; gaff->report->field[0]->value[4] = 0x0; - usbhid_submit_report(hid, gaff->report, USB_DIR_OUT); + hid_hw_request(hid, gaff->report, HID_REQ_SET_REPORT); return 0; } @@ -122,12 +120,12 @@ static int gaff_init(struct hid_device *hid) gaff->report->field[0]->value[1] = 0x00; gaff->report->field[0]->value[2] = 0x00; gaff->report->field[0]->value[3] = 0x00; - usbhid_submit_report(hid, gaff->report, USB_DIR_OUT); + hid_hw_request(hid, gaff->report, HID_REQ_SET_REPORT); gaff->report->field[0]->value[0] = 0xfa; gaff->report->field[0]->value[1] = 0xfe; - usbhid_submit_report(hid, gaff->report, USB_DIR_OUT); + hid_hw_request(hid, gaff->report, HID_REQ_SET_REPORT); hid_info(hid, "Force Feedback for GreenAsia 0x12 devices by Lukasz Lubojanski <lukasz@lubojanski.info>\n"); diff --git a/drivers/hid/hid-holtekff.c b/drivers/hid/hid-holtekff.c index f34d118..9a8f051 100644 --- a/drivers/hid/hid-holtekff.c +++ b/drivers/hid/hid-holtekff.c @@ -27,12 +27,10 @@ #include <linux/input.h> #include <linux/module.h> #include <linux/slab.h> -#include <linux/usb.h> #include "hid-ids.h" #ifdef CONFIG_HOLTEK_FF -#include "usbhid/usbhid.h" MODULE_LICENSE("GPL"); MODULE_AUTHOR("Anssi Hannula <anssi.hannula@iki.fi>"); @@ -102,7 +100,7 @@ static void holtekff_send(struct holtekff_device *holtekff, dbg_hid("sending %*ph\n", 7, data); - usbhid_submit_report(hid, holtekff->field->report, USB_DIR_OUT); + hid_hw_request(hid, holtekff->field->report, HID_REQ_SET_REPORT); } static int holtekff_play(struct input_dev *dev, void *data, diff --git a/drivers/hid/hid-kye.c b/drivers/hid/hid-kye.c index ef72dae..6af90db 100644 --- a/drivers/hid/hid-kye.c +++ b/drivers/hid/hid-kye.c @@ -16,8 +16,6 @@ #include <linux/device.h> #include <linux/hid.h> #include <linux/module.h> -#include <linux/usb.h> -#include "usbhid/usbhid.h" #include "hid-ids.h" @@ -361,7 +359,7 @@ static int kye_tablet_enable(struct hid_device *hdev) value[4] = 0x00; value[5] = 0x00; value[6] = 0x00; - usbhid_submit_report(hdev, report, USB_DIR_OUT); + hid_hw_request(hdev, report, HID_REQ_SET_REPORT); return 0; } diff --git a/drivers/hid/hid-lenovo-tpkbd.c b/drivers/hid/hid-lenovo-tpkbd.c index 956c3b1..a0535fd 100644 --- a/drivers/hid/hid-lenovo-tpkbd.c +++ b/drivers/hid/hid-lenovo-tpkbd.c @@ -68,7 +68,7 @@ static int tpkbd_features_set(struct hid_device *hdev) report->field[2]->value[0] = data_pointer->sensitivity; report->field[3]->value[0] = data_pointer->press_speed; - usbhid_submit_report(hdev, report, USB_DIR_OUT); + hid_hw_request(hdev, report, HID_REQ_SET_REPORT); return 0; } @@ -332,7 +332,7 @@ static void tpkbd_led_brightness_set(struct led_classdev *led_cdev, report = hdev->report_enum[HID_OUTPUT_REPORT].report_id_hash[3]; report->field[0]->value[0] = (data_pointer->led_state >> 0) & 1; report->field[0]->value[1] = (data_pointer->led_state >> 1) & 1; - usbhid_submit_report(hdev, report, USB_DIR_OUT); + hid_hw_request(hdev, report, HID_REQ_SET_REPORT); } static int tpkbd_probe_tp(struct hid_device *hdev) diff --git a/drivers/hid/hid-lg2ff.c b/drivers/hid/hid-lg2ff.c index 3c31bc6..b3cd150 100644 --- a/drivers/hid/hid-lg2ff.c +++ b/drivers/hid/hid-lg2ff.c @@ -23,10 +23,8 @@ #include <linux/input.h> #include <linux/slab.h> -#include <linux/usb.h> #include <linux/hid.h> -#include "usbhid/usbhid.h" #include "hid-lg.h" struct lg2ff_device { @@ -56,7 +54,7 @@ static int play_effect(struct input_dev *dev, void *data, lg2ff->report->field[0]->value[4] = 0x00; } - usbhid_submit_report(hid, lg2ff->report, USB_DIR_OUT); + hid_hw_request(hid, lg2ff->report, HID_REQ_SET_REPORT); return 0; } @@ -108,7 +106,7 @@ int lg2ff_init(struct hid_device *hid) report->field[0]->value[5] = 0x00; report->field[0]->value[6] = 0x00; - usbhid_submit_report(hid, report, USB_DIR_OUT); + hid_hw_request(hid, report, HID_REQ_SET_REPORT); hid_info(hid, "Force feedback for Logitech RumblePad/Rumblepad 2 by Anssi Hannula <anssi.hannula@gmail.com>\n"); diff --git a/drivers/hid/hid-lg3ff.c b/drivers/hid/hid-lg3ff.c index f98644c..e52f181 100644 --- a/drivers/hid/hid-lg3ff.c +++ b/drivers/hid/hid-lg3ff.c @@ -22,10 +22,8 @@ #include <linux/input.h> -#include <linux/usb.h> #include <linux/hid.h> -#include "usbhid/usbhid.h" #include "hid-lg.h" /* @@ -92,7 +90,7 @@ static int hid_lg3ff_play(struct input_dev *dev, void *data, report->field[0]->value[1] = (unsigned char)(-x); report->field[0]->value[31] = (unsigned char)(-y); - usbhid_submit_report(hid, report, USB_DIR_OUT); + hid_hw_request(hid, report, HID_REQ_SET_REPORT); break; } return 0; @@ -118,7 +116,7 @@ static void hid_lg3ff_set_autocenter(struct input_dev *dev, u16 magnitude) report->field[0]->value[33] = 0x7F; report->field[0]->value[34] = 0x7F; - usbhid_submit_report(hid, report, USB_DIR_OUT); + hid_hw_request(hid, report, HID_REQ_SET_REPORT); } diff --git a/drivers/hid/hid-lg4ff.c b/drivers/hid/hid-lg4ff.c index d7947c7..727d920 100644 --- a/drivers/hid/hid-lg4ff.c +++ b/drivers/hid/hid-lg4ff.c @@ -207,7 +207,7 @@ static int hid_lg4ff_play(struct input_dev *dev, void *data, struct ff_effect *e value[5] = 0x00; value[6] = 0x00; - usbhid_submit_report(hid, report, USB_DIR_OUT); + hid_hw_request(hid, report, HID_REQ_SET_REPORT); break; } return 0; @@ -230,7 +230,7 @@ static void hid_lg4ff_set_autocenter_default(struct input_dev *dev, u16 magnitud value[5] = 0x00; value[6] = 0x00; - usbhid_submit_report(hid, report, USB_DIR_OUT); + hid_hw_request(hid, report, HID_REQ_SET_REPORT); } /* Sends autocentering command compatible with Formula Force EX */ @@ -250,7 +250,7 @@ static void hid_lg4ff_set_autocenter_ffex(struct input_dev *dev, u16 magnitude) value[5] = 0x00; value[6] = 0x00; - usbhid_submit_report(hid, report, USB_DIR_OUT); + hid_hw_request(hid, report, HID_REQ_SET_REPORT); } /* Sends command to set range compatible with G25/G27/Driving Force GT */ @@ -270,7 +270,7 @@ static void hid_lg4ff_set_range_g25(struct hid_device *hid, u16 range) value[5] = 0x00; value[6] = 0x00; - usbhid_submit_report(hid, report, USB_DIR_OUT); + hid_hw_request(hid, report, HID_REQ_SET_REPORT); } /* Sends commands to set range compatible with Driving Force Pro wheel */ @@ -299,7 +299,7 @@ static void hid_lg4ff_set_range_dfp(struct hid_device *hid, __u16 range) report->field[0]->value[1] = 0x02; full_range = 200; } - usbhid_submit_report(hid, report, USB_DIR_OUT); + hid_hw_request(hid, report, HID_REQ_SET_REPORT); /* Prepare "fine" limit command */ value[0] = 0x81; @@ -311,7 +311,7 @@ static void hid_lg4ff_set_range_dfp(struct hid_device *hid, __u16 range) value[6] = 0x00; if (range == 200 || range == 900) { /* Do not apply any fine limit */ - usbhid_submit_report(hid, report, USB_DIR_OUT); + hid_hw_request(hid, report, HID_REQ_SET_REPORT); return; } @@ -325,7 +325,7 @@ static void hid_lg4ff_set_range_dfp(struct hid_device *hid, __u16 range) value[5] = (start_right & 0xe) << 4 | (start_left & 0xe); value[6] = 0xff; - usbhid_submit_report(hid, report, USB_DIR_OUT); + hid_hw_request(hid, report, HID_REQ_SET_REPORT); } static void hid_lg4ff_switch_native(struct hid_device *hid, const struct lg4ff_native_cmd *cmd) @@ -339,7 +339,7 @@ static void hid_lg4ff_switch_native(struct hid_device *hid, const struct lg4ff_n for (i = 0; i < 7; i++) report->field[0]->value[i] = cmd->cmd[j++]; - usbhid_submit_report(hid, report, USB_DIR_OUT); + hid_hw_request(hid, report, HID_REQ_SET_REPORT); } } @@ -415,7 +415,7 @@ static void lg4ff_set_leds(struct hid_device *hid, __u8 leds) value[4] = 0x00; value[5] = 0x00; value[6] = 0x00; - usbhid_submit_report(hid, report, USB_DIR_OUT); + hid_hw_request(hid, report, HID_REQ_SET_REPORT); } static void lg4ff_led_set_brightness(struct led_classdev *led_cdev, diff --git a/drivers/hid/hid-lgff.c b/drivers/hid/hid-lgff.c index 27bc54f..d7ea8c8 100644 --- a/drivers/hid/hid-lgff.c +++ b/drivers/hid/hid-lgff.c @@ -30,10 +30,8 @@ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #include <linux/input.h> -#include <linux/usb.h> #include <linux/hid.h> -#include "usbhid/usbhid.h" #include "hid-lg.h" struct dev_type { @@ -89,7 +87,7 @@ static int hid_lgff_play(struct input_dev *dev, void *data, struct ff_effect *ef report->field[0]->value[2] = x; report->field[0]->value[3] = y; dbg_hid("(x, y)=(%04x, %04x)\n", x, y); - usbhid_submit_report(hid, report, USB_DIR_OUT); + hid_hw_request(hid, report, HID_REQ_SET_REPORT); break; case FF_RUMBLE: @@ -104,7 +102,7 @@ static int hid_lgff_play(struct input_dev *dev, void *data, struct ff_effect *ef report->field[0]->value[2] = left; report->field[0]->value[3] = right; dbg_hid("(left, right)=(%04x, %04x)\n", left, right); - usbhid_submit_report(hid, report, USB_DIR_OUT); + hid_hw_request(hid, report, HID_REQ_SET_REPORT); break; } return 0; @@ -124,7 +122,7 @@ static void hid_lgff_set_autocenter(struct input_dev *dev, u16 magnitude) *value++ = 0x80; *value++ = 0x00; *value = 0x00; - usbhid_submit_report(hid, report, USB_DIR_OUT); + hid_hw_request(hid, report, HID_REQ_SET_REPORT); } int lgff_init(struct hid_device* hid) diff --git a/drivers/hid/hid-logitech-dj.c b/drivers/hid/hid-logitech-dj.c index 9500f2f..3cf62be 100644 --- a/drivers/hid/hid-logitech-dj.c +++ b/drivers/hid/hid-logitech-dj.c @@ -27,7 +27,6 @@ #include <linux/module.h> #include <linux/usb.h> #include <asm/unaligned.h> -#include "usbhid/usbhid.h" #include "hid-ids.h" #include "hid-logitech-dj.h" @@ -638,7 +637,7 @@ static int logi_dj_ll_input_event(struct input_dev *dev, unsigned int type, hid_set_field(report->field[0], 1, REPORT_TYPE_LEDS); hid_set_field(report->field[0], 2, data[1]); - usbhid_submit_report(dj_rcv_hiddev, report, USB_DIR_OUT); + hid_hw_request(dj_rcv_hiddev, report, HID_REQ_SET_REPORT); return 0; diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c index 7a1ebb8..32258ba 100644 --- a/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c @@ -736,7 +736,7 @@ static void mt_set_input_mode(struct hid_device *hdev) r = re->report_id_hash[td->inputmode]; if (r) { r->field[0]->value[td->inputmode_index] = 0x02; - usbhid_submit_report(hdev, r, USB_DIR_OUT); + hid_hw_request(hdev, r, HID_REQ_SET_REPORT); } } @@ -761,7 +761,7 @@ static void mt_set_maxcontacts(struct hid_device *hdev) max = min(fieldmax, max); if (r->field[0]->value[0] != max) { r->field[0]->value[0] = max; - usbhid_submit_report(hdev, r, USB_DIR_OUT); + hid_hw_request(hdev, r, HID_REQ_SET_REPORT); } } } diff --git a/drivers/hid/hid-ntrig.c b/drivers/hid/hid-ntrig.c index 2ffc0e3..a722599 100644 --- a/drivers/hid/hid-ntrig.c +++ b/drivers/hid/hid-ntrig.c @@ -118,7 +118,7 @@ static inline int ntrig_get_mode(struct hid_device *hdev) if (!report) return -EINVAL; - usbhid_submit_report(hdev, report, USB_DIR_IN); + hid_hw_request(hdev, report, HID_REQ_GET_REPORT); usbhid_wait_io(hdev); return (int)report->field[0]->value[0]; } @@ -137,7 +137,7 @@ static inline void ntrig_set_mode(struct hid_device *hdev, const int mode) if (!report) return; - usbhid_submit_report(hdev, report, USB_DIR_IN); + hid_hw_request(hdev, report, HID_REQ_GET_REPORT); } static void ntrig_report_version(struct hid_device *hdev) @@ -939,7 +939,7 @@ static int ntrig_probe(struct hid_device *hdev, const struct hid_device_id *id) /* Let the device settle to ensure the wakeup message gets * through */ usbhid_wait_io(hdev); - usbhid_submit_report(hdev, report, USB_DIR_IN); + hid_hw_request(hdev, report, HID_REQ_GET_REPORT); /* * Sanity check: if the current mode is invalid reset it to diff --git a/drivers/hid/hid-picolcd.h b/drivers/hid/hid-picolcd.h index 020cef6..2941891 100644 --- a/drivers/hid/hid-picolcd.h +++ b/drivers/hid/hid-picolcd.h @@ -142,10 +142,10 @@ struct hid_report *picolcd_report(int id, struct hid_device *hdev, int dir); #ifdef CONFIG_DEBUG_FS void picolcd_debug_out_report(struct picolcd_data *data, struct hid_device *hdev, struct hid_report *report); -#define usbhid_submit_report(a, b, c) \ +#define hid_hw_request(a, b, c) \ do { \ picolcd_debug_out_report(hid_get_drvdata(a), a, b); \ - usbhid_submit_report(a, b, c); \ + hid_hw_request(a, b, c); \ } while (0) void picolcd_debug_raw_event(struct picolcd_data *data, diff --git a/drivers/hid/hid-picolcd_backlight.c b/drivers/hid/hid-picolcd_backlight.c index b91f309..a32c5f8 100644 --- a/drivers/hid/hid-picolcd_backlight.c +++ b/drivers/hid/hid-picolcd_backlight.c @@ -18,8 +18,6 @@ ***************************************************************************/ #include <linux/hid.h> -#include "usbhid/usbhid.h" -#include <linux/usb.h> #include <linux/fb.h> #include <linux/backlight.h> @@ -46,7 +44,7 @@ static int picolcd_set_brightness(struct backlight_device *bdev) spin_lock_irqsave(&data->lock, flags); hid_set_field(report->field[0], 0, data->lcd_power == FB_BLANK_UNBLANK ? data->lcd_brightness : 0); if (!(data->status & PICOLCD_FAILED)) - usbhid_submit_report(data->hdev, report, USB_DIR_OUT); + hid_hw_request(data->hdev, report, HID_REQ_SET_REPORT); spin_unlock_irqrestore(&data->lock, flags); return 0; } diff --git a/drivers/hid/hid-picolcd_cir.c b/drivers/hid/hid-picolcd_cir.c index a79e95b..e346038 100644 --- a/drivers/hid/hid-picolcd_cir.c +++ b/drivers/hid/hid-picolcd_cir.c @@ -21,8 +21,6 @@ #include <linux/hid-debug.h> #include <linux/input.h> #include "hid-ids.h" -#include "usbhid/usbhid.h" -#include <linux/usb.h> #include <linux/fb.h> #include <linux/vmalloc.h> diff --git a/drivers/hid/hid-picolcd_core.c b/drivers/hid/hid-picolcd_core.c index 31cd93f..b48092d 100644 --- a/drivers/hid/hid-picolcd_core.c +++ b/drivers/hid/hid-picolcd_core.c @@ -21,8 +21,6 @@ #include <linux/hid-debug.h> #include <linux/input.h> #include "hid-ids.h" -#include "usbhid/usbhid.h" -#include <linux/usb.h> #include <linux/fb.h> #include <linux/vmalloc.h> @@ -110,7 +108,7 @@ struct picolcd_pending *picolcd_send_and_wait(struct hid_device *hdev, work = NULL; } else { data->pending = work; - usbhid_submit_report(data->hdev, report, USB_DIR_OUT); + hid_hw_request(data->hdev, report, HID_REQ_SET_REPORT); spin_unlock_irqrestore(&data->lock, flags); wait_for_completion_interruptible_timeout(&work->ready, HZ*2); spin_lock_irqsave(&data->lock, flags); @@ -244,7 +242,7 @@ int picolcd_reset(struct hid_device *hdev) spin_unlock_irqrestore(&data->lock, flags); return -ENODEV; } - usbhid_submit_report(hdev, report, USB_DIR_OUT); + hid_hw_request(hdev, report, HID_REQ_SET_REPORT); spin_unlock_irqrestore(&data->lock, flags); error = picolcd_check_version(hdev); @@ -303,7 +301,7 @@ static ssize_t picolcd_operation_mode_store(struct device *dev, spin_lock_irqsave(&data->lock, flags); hid_set_field(report->field[0], 0, timeout & 0xff); hid_set_field(report->field[0], 1, (timeout >> 8) & 0xff); - usbhid_submit_report(data->hdev, report, USB_DIR_OUT); + hid_hw_request(data->hdev, report, HID_REQ_SET_REPORT); spin_unlock_irqrestore(&data->lock, flags); return count; } diff --git a/drivers/hid/hid-picolcd_debugfs.c b/drivers/hid/hid-picolcd_debugfs.c index 4809aa1..59ab8e1 100644 --- a/drivers/hid/hid-picolcd_debugfs.c +++ b/drivers/hid/hid-picolcd_debugfs.c @@ -19,8 +19,6 @@ #include <linux/hid.h> #include <linux/hid-debug.h> -#include "usbhid/usbhid.h" -#include <linux/usb.h> #include <linux/fb.h> #include <linux/seq_file.h> diff --git a/drivers/hid/hid-picolcd_fb.c b/drivers/hid/hid-picolcd_fb.c index eb00357..98f61de 100644 --- a/drivers/hid/hid-picolcd_fb.c +++ b/drivers/hid/hid-picolcd_fb.c @@ -20,7 +20,6 @@ #include <linux/hid.h> #include <linux/vmalloc.h> #include "usbhid/usbhid.h" -#include <linux/usb.h> #include <linux/fb.h> #include <linux/module.h> @@ -143,8 +142,8 @@ static int picolcd_fb_send_tile(struct picolcd_data *data, u8 *vbitmap, else hid_set_field(report2->field[0], 4 + i - 32, tdata[i]); - usbhid_submit_report(data->hdev, report1, USB_DIR_OUT); - usbhid_submit_report(data->hdev, report2, USB_DIR_OUT); + hid_hw_request(data->hdev, report1, HID_REQ_SET_REPORT); + hid_hw_request(data->hdev, report2, HID_REQ_SET_REPORT); spin_unlock_irqrestore(&data->lock, flags); return 0; } @@ -214,7 +213,7 @@ int picolcd_fb_reset(struct picolcd_data *data, int clear) hid_set_field(report->field[0], j, mapcmd[j]); else hid_set_field(report->field[0], j, 0); - usbhid_submit_report(data->hdev, report, USB_DIR_OUT); + hid_hw_request(data->hdev, report, HID_REQ_SET_REPORT); } spin_unlock_irqrestore(&data->lock, flags); diff --git a/drivers/hid/hid-picolcd_lcd.c b/drivers/hid/hid-picolcd_lcd.c index 2d0ddc5..89821c2 100644 --- a/drivers/hid/hid-picolcd_lcd.c +++ b/drivers/hid/hid-picolcd_lcd.c @@ -18,8 +18,6 @@ ***************************************************************************/ #include <linux/hid.h> -#include "usbhid/usbhid.h" -#include <linux/usb.h> #include <linux/fb.h> #include <linux/lcd.h> @@ -48,7 +46,7 @@ static int picolcd_set_contrast(struct lcd_device *ldev, int contrast) spin_lock_irqsave(&data->lock, flags); hid_set_field(report->field[0], 0, data->lcd_contrast); if (!(data->status & PICOLCD_FAILED)) - usbhid_submit_report(data->hdev, report, USB_DIR_OUT); + hid_hw_request(data->hdev, report, HID_REQ_SET_REPORT); spin_unlock_irqrestore(&data->lock, flags); return 0; } diff --git a/drivers/hid/hid-picolcd_leds.c b/drivers/hid/hid-picolcd_leds.c index 28cb6a4..e994f9c 100644 --- a/drivers/hid/hid-picolcd_leds.c +++ b/drivers/hid/hid-picolcd_leds.c @@ -21,8 +21,6 @@ #include <linux/hid-debug.h> #include <linux/input.h> #include "hid-ids.h" -#include "usbhid/usbhid.h" -#include <linux/usb.h> #include <linux/fb.h> #include <linux/vmalloc.h> @@ -55,7 +53,7 @@ void picolcd_leds_set(struct picolcd_data *data) spin_lock_irqsave(&data->lock, flags); hid_set_field(report->field[0], 0, data->led_state); if (!(data->status & PICOLCD_FAILED)) - usbhid_submit_report(data->hdev, report, USB_DIR_OUT); + hid_hw_request(data->hdev, report, HID_REQ_SET_REPORT); spin_unlock_irqrestore(&data->lock, flags); } diff --git a/drivers/hid/hid-pl.c b/drivers/hid/hid-pl.c index b0199d2..d29112f 100644 --- a/drivers/hid/hid-pl.c +++ b/drivers/hid/hid-pl.c @@ -43,13 +43,11 @@ #include <linux/input.h> #include <linux/slab.h> #include <linux/module.h> -#include <linux/usb.h> #include <linux/hid.h> #include "hid-ids.h" #ifdef CONFIG_PANTHERLORD_FF -#include "usbhid/usbhid.h" struct plff_device { struct hid_report *report; @@ -75,7 +73,7 @@ static int hid_plff_play(struct input_dev *dev, void *data, *plff->strong = left; *plff->weak = right; debug("running with 0x%02x 0x%02x", left, right); - usbhid_submit_report(hid, plff->report, USB_DIR_OUT); + hid_hw_request(hid, plff->report, HID_REQ_SET_REPORT); return 0; } @@ -169,7 +167,7 @@ static int plff_init(struct hid_device *hid) *strong = 0x00; *weak = 0x00; - usbhid_submit_report(hid, plff->report, USB_DIR_OUT); + hid_hw_request(hid, plff->report, HID_REQ_SET_REPORT); } hid_info(hid, "Force feedback for PantherLord/GreenAsia devices by Anssi Hannula <anssi.hannula@gmail.com>\n"); diff --git a/drivers/hid/hid-prodikeys.c b/drivers/hid/hid-prodikeys.c index 4e1c4bc..7ed8280 100644 --- a/drivers/hid/hid-prodikeys.c +++ b/drivers/hid/hid-prodikeys.c @@ -26,7 +26,6 @@ #include <sound/core.h> #include <sound/initval.h> #include <sound/rawmidi.h> -#include "usbhid/usbhid.h" #include "hid-ids.h" @@ -306,7 +305,7 @@ static void pcmidi_submit_output_report(struct pcmidi_snd *pm, int state) report->field[0]->value[0] = 0x01; report->field[0]->value[1] = state; - usbhid_submit_report(hdev, report, USB_DIR_OUT); + hid_hw_request(hdev, report, HID_REQ_SET_REPORT); } static int pcmidi_handle_report1(struct pcmidi_snd *pm, u8 *data) diff --git a/drivers/hid/hid-sensor-hub.c b/drivers/hid/hid-sensor-hub.c index 4179f5e..569cc07 100644 --- a/drivers/hid/hid-sensor-hub.c +++ b/drivers/hid/hid-sensor-hub.c @@ -18,7 +18,6 @@ */ #include <linux/device.h> #include <linux/hid.h> -#include <linux/usb.h> #include "usbhid/usbhid.h" #include <linux/module.h> #include <linux/slab.h> @@ -204,7 +203,7 @@ int sensor_hub_set_feature(struct hid_sensor_hub_device *hsdev, u32 report_id, goto done_proc; } hid_set_field(report->field[field_index], 0, value); - usbhid_submit_report(hsdev->hdev, report, USB_DIR_OUT); + hid_hw_request(hsdev->hdev, report, HID_REQ_SET_REPORT); usbhid_wait_io(hsdev->hdev); done_proc: @@ -227,7 +226,7 @@ int sensor_hub_get_feature(struct hid_sensor_hub_device *hsdev, u32 report_id, ret = -EINVAL; goto done_proc; } - usbhid_submit_report(hsdev->hdev, report, USB_DIR_IN); + hid_hw_request(hsdev->hdev, report, HID_REQ_GET_REPORT); usbhid_wait_io(hsdev->hdev); *value = report->field[field_index]->value[0]; @@ -262,7 +261,7 @@ int sensor_hub_input_attr_get_raw_value(struct hid_sensor_hub_device *hsdev, spin_unlock_irqrestore(&data->lock, flags); goto err_free; } - usbhid_submit_report(hsdev->hdev, report, USB_DIR_IN); + hid_hw_request(hsdev->hdev, report, HID_REQ_GET_REPORT); spin_unlock_irqrestore(&data->lock, flags); wait_for_completion_interruptible_timeout(&data->pending.ready, HZ*5); switch (data->pending.raw_size) { diff --git a/drivers/hid/hid-sjoy.c b/drivers/hid/hid-sjoy.c index 28f7740..37845ec 100644 --- a/drivers/hid/hid-sjoy.c +++ b/drivers/hid/hid-sjoy.c @@ -28,13 +28,11 @@ #include <linux/input.h> #include <linux/slab.h> -#include <linux/usb.h> #include <linux/hid.h> #include <linux/module.h> #include "hid-ids.h" #ifdef CONFIG_SMARTJOYPLUS_FF -#include "usbhid/usbhid.h" struct sjoyff_device { struct hid_report *report; @@ -57,7 +55,7 @@ static int hid_sjoyff_play(struct input_dev *dev, void *data, sjoyff->report->field[0]->value[1] = right; sjoyff->report->field[0]->value[2] = left; dev_dbg(&dev->dev, "running with 0x%02x 0x%02x\n", left, right); - usbhid_submit_report(hid, sjoyff->report, USB_DIR_OUT); + hid_hw_request(hid, sjoyff->report, HID_REQ_SET_REPORT); return 0; } @@ -115,7 +113,7 @@ static int sjoyff_init(struct hid_device *hid) sjoyff->report->field[0]->value[0] = 0x01; sjoyff->report->field[0]->value[1] = 0x00; sjoyff->report->field[0]->value[2] = 0x00; - usbhid_submit_report(hid, sjoyff->report, USB_DIR_OUT); + hid_hw_request(hid, sjoyff->report, HID_REQ_SET_REPORT); } hid_info(hid, "Force feedback for SmartJoy PLUS PS2/USB adapter\n"); diff --git a/drivers/hid/hid-steelseries.c b/drivers/hid/hid-steelseries.c index 2ed995c..98e66ac 100644 --- a/drivers/hid/hid-steelseries.c +++ b/drivers/hid/hid-steelseries.c @@ -16,7 +16,6 @@ #include <linux/hid.h> #include <linux/module.h> -#include "usbhid/usbhid.h" #include "hid-ids.h" #if defined(CONFIG_LEDS_CLASS) || defined(CONFIG_LEDS_CLASS_MODULE) @@ -132,7 +131,7 @@ static void steelseries_srws1_set_leds(struct hid_device *hdev, __u16 leds) value[14] = 0x00; value[15] = 0x00; - usbhid_submit_report(hdev, report, USB_DIR_OUT); + hid_hw_request(hdev, report, HID_REQ_SET_REPORT); /* Note: LED change does not show on device until the device is read/polled */ } diff --git a/drivers/hid/hid-tmff.c b/drivers/hid/hid-tmff.c index e4fcf3f..b833760 100644 --- a/drivers/hid/hid-tmff.c +++ b/drivers/hid/hid-tmff.c @@ -30,7 +30,6 @@ #include <linux/hid.h> #include <linux/input.h> #include <linux/slab.h> -#include <linux/usb.h> #include <linux/module.h> #include "hid-ids.h" @@ -46,7 +45,6 @@ static const signed short ff_joystick[] = { }; #ifdef CONFIG_THRUSTMASTER_FF -#include "usbhid/usbhid.h" /* Usages for thrustmaster devices I know about */ #define THRUSTMASTER_USAGE_FF (HID_UP_GENDESK | 0xbb) @@ -103,7 +101,7 @@ static int tmff_play(struct input_dev *dev, void *data, dbg_hid("(x, y)=(%04x, %04x)\n", x, y); ff_field->value[0] = x; ff_field->value[1] = y; - usbhid_submit_report(hid, tmff->report, USB_DIR_OUT); + hid_hw_request(hid, tmff->report, HID_REQ_SET_REPORT); break; case FF_RUMBLE: @@ -117,7 +115,7 @@ static int tmff_play(struct input_dev *dev, void *data, dbg_hid("(left,right)=(%08x, %08x)\n", left, right); ff_field->value[0] = left; ff_field->value[1] = right; - usbhid_submit_report(hid, tmff->report, USB_DIR_OUT); + hid_hw_request(hid, tmff->report, HID_REQ_SET_REPORT); break; } return 0; diff --git a/drivers/hid/hid-zpff.c b/drivers/hid/hid-zpff.c index af66452..6ec28a3 100644 --- a/drivers/hid/hid-zpff.c +++ b/drivers/hid/hid-zpff.c @@ -24,13 +24,11 @@ #include <linux/hid.h> #include <linux/input.h> #include <linux/slab.h> -#include <linux/usb.h> #include <linux/module.h> #include "hid-ids.h" #ifdef CONFIG_ZEROPLUS_FF -#include "usbhid/usbhid.h" struct zpff_device { struct hid_report *report; @@ -59,7 +57,7 @@ static int zpff_play(struct input_dev *dev, void *data, zpff->report->field[2]->value[0] = left; zpff->report->field[3]->value[0] = right; dbg_hid("running with 0x%02x 0x%02x\n", left, right); - usbhid_submit_report(hid, zpff->report, USB_DIR_OUT); + hid_hw_request(hid, zpff->report, HID_REQ_SET_REPORT); return 0; } @@ -104,7 +102,7 @@ static int zpff_init(struct hid_device *hid) zpff->report->field[1]->value[0] = 0x02; zpff->report->field[2]->value[0] = 0x00; zpff->report->field[3]->value[0] = 0x00; - usbhid_submit_report(hid, zpff->report, USB_DIR_OUT); + hid_hw_request(hid, zpff->report, HID_REQ_SET_REPORT); hid_info(hid, "force feedback for Zeroplus based devices by Anssi Hannula <anssi.hannula@gmail.com>\n"); diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c index 99d95d3..da68687 100644 --- a/drivers/hid/usbhid/hid-core.c +++ b/drivers/hid/usbhid/hid-core.c @@ -639,7 +639,7 @@ static void __usbhid_submit_report(struct hid_device *hid, struct hid_report *re } } -void usbhid_submit_report(struct hid_device *hid, struct hid_report *report, unsigned char dir) +static void usbhid_submit_report(struct hid_device *hid, struct hid_report *report, unsigned char dir) { struct usbhid_device *usbhid = hid->driver_data; unsigned long flags; @@ -648,7 +648,6 @@ void usbhid_submit_report(struct hid_device *hid, struct hid_report *report, uns __usbhid_submit_report(hid, report, dir); spin_unlock_irqrestore(&usbhid->lock, flags); } -EXPORT_SYMBOL_GPL(usbhid_submit_report); /* Workqueue routine to send requests to change LEDs */ static void hid_led(struct work_struct *work) diff --git a/drivers/hid/usbhid/hid-pidff.c b/drivers/hid/usbhid/hid-pidff.c index f91c136..0f1efa3 100644 --- a/drivers/hid/usbhid/hid-pidff.c +++ b/drivers/hid/usbhid/hid-pidff.c @@ -263,8 +263,8 @@ static void pidff_set_envelope_report(struct pidff_device *pidff, envelope->attack_level, pidff->set_envelope[PID_ATTACK_LEVEL].value[0]); - usbhid_submit_report(pidff->hid, pidff->reports[PID_SET_ENVELOPE], - USB_DIR_OUT); + hid_hw_request(pidff->hid, pidff->reports[PID_SET_ENVELOPE], + HID_REQ_SET_REPORT); } /* @@ -290,8 +290,8 @@ static void pidff_set_constant_force_report(struct pidff_device *pidff, pidff_set_signed(&pidff->set_constant[PID_MAGNITUDE], effect->u.constant.level); - usbhid_submit_report(pidff->hid, pidff->reports[PID_SET_CONSTANT], - USB_DIR_OUT); + hid_hw_request(pidff->hid, pidff->reports[PID_SET_CONSTANT], + HID_REQ_SET_REPORT); } /* @@ -325,8 +325,8 @@ static void pidff_set_effect_report(struct pidff_device *pidff, pidff->effect_direction); pidff->set_effect[PID_START_DELAY].value[0] = effect->replay.delay; - usbhid_submit_report(pidff->hid, pidff->reports[PID_SET_EFFECT], - USB_DIR_OUT); + hid_hw_request(pidff->hid, pidff->reports[PID_SET_EFFECT], + HID_REQ_SET_REPORT); } /* @@ -357,8 +357,8 @@ static void pidff_set_periodic_report(struct pidff_device *pidff, pidff_set(&pidff->set_periodic[PID_PHASE], effect->u.periodic.phase); pidff->set_periodic[PID_PERIOD].value[0] = effect->u.periodic.period; - usbhid_submit_report(pidff->hid, pidff->reports[PID_SET_PERIODIC], - USB_DIR_OUT); + hid_hw_request(pidff->hid, pidff->reports[PID_SET_PERIODIC], + HID_REQ_SET_REPORT); } @@ -399,8 +399,8 @@ static void pidff_set_condition_report(struct pidff_device *pidff, effect->u.condition[i].left_saturation); pidff_set(&pidff->set_condition[PID_DEAD_BAND], effect->u.condition[i].deadband); - usbhid_submit_report(pidff->hid, pidff->reports[PID_SET_CONDITION], - USB_DIR_OUT); + hid_hw_request(pidff->hid, pidff->reports[PID_SET_CONDITION], + HID_REQ_SET_REPORT); } } @@ -440,8 +440,8 @@ static void pidff_set_ramp_force_report(struct pidff_device *pidff, effect->u.ramp.start_level); pidff_set_signed(&pidff->set_ramp[PID_RAMP_END], effect->u.ramp.end_level); - usbhid_submit_report(pidff->hid, pidff->reports[PID_SET_RAMP], - USB_DIR_OUT); + hid_hw_request(pidff->hid, pidff->reports[PID_SET_RAMP], + HID_REQ_SET_REPORT); } /* @@ -465,8 +465,8 @@ static int pidff_request_effect_upload(struct pidff_device *pidff, int efnum) int j; pidff->create_new_effect_type->value[0] = efnum; - usbhid_submit_report(pidff->hid, pidff->reports[PID_CREATE_NEW_EFFECT], - USB_DIR_OUT); + hid_hw_request(pidff->hid, pidff->reports[PID_CREATE_NEW_EFFECT], + HID_REQ_SET_REPORT); hid_dbg(pidff->hid, "create_new_effect sent, type: %d\n", efnum); pidff->block_load[PID_EFFECT_BLOCK_INDEX].value[0] = 0; @@ -475,8 +475,8 @@ static int pidff_request_effect_upload(struct pidff_device *pidff, int efnum) for (j = 0; j < 60; j++) { hid_dbg(pidff->hid, "pid_block_load requested\n"); - usbhid_submit_report(pidff->hid, pidff->reports[PID_BLOCK_LOAD], - USB_DIR_IN); + hid_hw_request(pidff->hid, pidff->reports[PID_BLOCK_LOAD], + HID_REQ_GET_REPORT); usbhid_wait_io(pidff->hid); if (pidff->block_load_status->value[0] == pidff->status_id[PID_BLOCK_LOAD_SUCCESS]) { @@ -513,8 +513,8 @@ static void pidff_playback_pid(struct pidff_device *pidff, int pid_id, int n) pidff->effect_operation[PID_LOOP_COUNT].value[0] = n; } - usbhid_submit_report(pidff->hid, pidff->reports[PID_EFFECT_OPERATION], - USB_DIR_OUT); + hid_hw_request(pidff->hid, pidff->reports[PID_EFFECT_OPERATION], + HID_REQ_SET_REPORT); } /** @@ -535,8 +535,8 @@ static int pidff_playback(struct input_dev *dev, int effect_id, int value) static void pidff_erase_pid(struct pidff_device *pidff, int pid_id) { pidff->block_free[PID_EFFECT_BLOCK_INDEX].value[0] = pid_id; - usbhid_submit_report(pidff->hid, pidff->reports[PID_BLOCK_FREE], - USB_DIR_OUT); + hid_hw_request(pidff->hid, pidff->reports[PID_BLOCK_FREE], + HID_REQ_SET_REPORT); } /* @@ -718,8 +718,8 @@ static void pidff_set_gain(struct input_dev *dev, u16 gain) struct pidff_device *pidff = dev->ff->private; pidff_set(&pidff->device_gain[PID_DEVICE_GAIN_FIELD], gain); - usbhid_submit_report(pidff->hid, pidff->reports[PID_DEVICE_GAIN], - USB_DIR_OUT); + hid_hw_request(pidff->hid, pidff->reports[PID_DEVICE_GAIN], + HID_REQ_SET_REPORT); } static void pidff_autocenter(struct pidff_device *pidff, u16 magnitude) @@ -744,8 +744,8 @@ static void pidff_autocenter(struct pidff_device *pidff, u16 magnitude) pidff->set_effect[PID_DIRECTION_ENABLE].value[0] = 1; pidff->set_effect[PID_START_DELAY].value[0] = 0; - usbhid_submit_report(pidff->hid, pidff->reports[PID_SET_EFFECT], - USB_DIR_OUT); + hid_hw_request(pidff->hid, pidff->reports[PID_SET_EFFECT], + HID_REQ_SET_REPORT); } /* @@ -1158,18 +1158,18 @@ static void pidff_reset(struct pidff_device *pidff) pidff->device_control->value[0] = pidff->control_id[PID_RESET]; /* We reset twice as sometimes hid_wait_io isn't waiting long enough */ - usbhid_submit_report(hid, pidff->reports[PID_DEVICE_CONTROL], USB_DIR_OUT); + hid_hw_request(hid, pidff->reports[PID_DEVICE_CONTROL], HID_REQ_SET_REPORT); usbhid_wait_io(hid); - usbhid_submit_report(hid, pidff->reports[PID_DEVICE_CONTROL], USB_DIR_OUT); + hid_hw_request(hid, pidff->reports[PID_DEVICE_CONTROL], HID_REQ_SET_REPORT); usbhid_wait_io(hid); pidff->device_control->value[0] = pidff->control_id[PID_ENABLE_ACTUATORS]; - usbhid_submit_report(hid, pidff->reports[PID_DEVICE_CONTROL], USB_DIR_OUT); + hid_hw_request(hid, pidff->reports[PID_DEVICE_CONTROL], HID_REQ_SET_REPORT); usbhid_wait_io(hid); /* pool report is sometimes messed up, refetch it */ - usbhid_submit_report(hid, pidff->reports[PID_POOL], USB_DIR_IN); + hid_hw_request(hid, pidff->reports[PID_POOL], HID_REQ_GET_REPORT); usbhid_wait_io(hid); if (pidff->pool[PID_SIMULTANEOUS_MAX].value) { @@ -1181,8 +1181,8 @@ static void pidff_reset(struct pidff_device *pidff) break; } hid_dbg(pidff->hid, "pid_pool requested again\n"); - usbhid_submit_report(hid, pidff->reports[PID_POOL], - USB_DIR_IN); + hid_hw_request(hid, pidff->reports[PID_POOL], + HID_REQ_GET_REPORT); usbhid_wait_io(hid); } } @@ -1269,8 +1269,8 @@ int hid_pidff_init(struct hid_device *hid) if (test_bit(FF_GAIN, dev->ffbit)) { pidff_set(&pidff->device_gain[PID_DEVICE_GAIN_FIELD], 0xffff); - usbhid_submit_report(hid, pidff->reports[PID_DEVICE_GAIN], - USB_DIR_OUT); + hid_hw_request(hid, pidff->reports[PID_DEVICE_GAIN], + HID_REQ_SET_REPORT); } error = pidff_check_autocenter(pidff, dev); diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c index 87bd649..430d2a9 100644 --- a/drivers/hid/usbhid/hiddev.c +++ b/drivers/hid/usbhid/hiddev.c @@ -705,7 +705,7 @@ static long hiddev_ioctl(struct file *file, unsigned int cmd, unsigned long arg) if (report == NULL) break; - usbhid_submit_report(hid, report, USB_DIR_IN); + hid_hw_request(hid, report, HID_REQ_GET_REPORT); usbhid_wait_io(hid); r = 0; @@ -724,7 +724,7 @@ static long hiddev_ioctl(struct file *file, unsigned int cmd, unsigned long arg) if (report == NULL) break; - usbhid_submit_report(hid, report, USB_DIR_OUT); + hid_hw_request(hid, report, HID_REQ_SET_REPORT); usbhid_wait_io(hid); r = 0; diff --git a/drivers/hid/usbhid/usbhid.h b/drivers/hid/usbhid/usbhid.h index bd87a61..aa1d5ff 100644 --- a/drivers/hid/usbhid/usbhid.h +++ b/drivers/hid/usbhid/usbhid.h @@ -38,8 +38,6 @@ int usbhid_wait_io(struct hid_device* hid); void usbhid_close(struct hid_device *hid); int usbhid_open(struct hid_device *hid); void usbhid_init_reports(struct hid_device *hid); -void usbhid_submit_report -(struct hid_device *hid, struct hid_report *report, unsigned char dir); int usbhid_get_power(struct hid_device *hid); void usbhid_put_power(struct hid_device *hid); struct usb_interface *usbhid_find_interface(int minor); -- 1.8.1 ^ permalink raw reply related [flat|nested] 24+ messages in thread
* Re: [PATCH 4/7] hid: use hid_hw_request() instead of direct call to usbhid 2013-02-08 14:37 ` [PATCH 4/7] hid: use hid_hw_request() instead of direct call to usbhid Benjamin Tissoires @ 2013-02-20 20:16 ` Henrik Rydberg 0 siblings, 0 replies; 24+ messages in thread From: Henrik Rydberg @ 2013-02-20 20:16 UTC (permalink / raw) To: Benjamin Tissoires Cc: Dmitry Torokhov, Jiri Kosina, Stephane Chatty, linux-input, linux-kernel Hi Benjamin, > This allows the hid drivers to be independent from the transport layer. Since the patch is pretty large, a few lines on how it was constructed might be in order. Something like "by replacing all occurences of usbhid_submit_report() by its hid_hw_request() counterpart". Also, the list of dependency changes only contains the drivers that actually become completely decoupled with this patch. The drivers that also depend on the io wait are found in the next patch. > > Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com> > --- Thanks, Henrik ^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH 5/7] HID: use hid_hw_wait() instead of direct call to usbhid 2013-02-08 14:37 [PATCH 0/7] hid driver transport cleanup Benjamin Tissoires ` (3 preceding siblings ...) 2013-02-08 14:37 ` [PATCH 4/7] hid: use hid_hw_request() instead of direct call to usbhid Benjamin Tissoires @ 2013-02-08 14:37 ` Benjamin Tissoires 2013-02-20 20:18 ` Henrik Rydberg 2013-02-08 14:37 ` [PATCH 6/7] HID: multitouch: remove usbhid dependency Benjamin Tissoires ` (4 subsequent siblings) 9 siblings, 1 reply; 24+ messages in thread From: Benjamin Tissoires @ 2013-02-08 14:37 UTC (permalink / raw) To: Benjamin Tissoires, Dmitry Torokhov, Henrik Rydberg, Jiri Kosina, Stephane Chatty, linux-input, linux-kernel This removes most of the dependencies between hid drivers and usbhid. Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com> --- drivers/hid/Kconfig | 2 +- drivers/hid/hid-ntrig.c | 4 ++-- drivers/hid/hid-picolcd_fb.c | 5 ++--- drivers/hid/hid-sensor-hub.c | 5 ++--- drivers/hid/usbhid/hid-core.c | 3 +-- drivers/hid/usbhid/hid-pidff.c | 16 ++++++++-------- drivers/hid/usbhid/hiddev.c | 4 ++-- drivers/hid/usbhid/usbhid.h | 1 - 8 files changed, 18 insertions(+), 22 deletions(-) diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index d60a427..f517d4a 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -479,7 +479,7 @@ config HID_PETALYNX config HID_PICOLCD tristate "PicoLCD (graphic version)" - depends on USB_HID + depends on HID ---help--- This provides support for Minibox PicoLCD devices, currently only the graphical ones are supported. diff --git a/drivers/hid/hid-ntrig.c b/drivers/hid/hid-ntrig.c index a722599..e3c2e52 100644 --- a/drivers/hid/hid-ntrig.c +++ b/drivers/hid/hid-ntrig.c @@ -119,7 +119,7 @@ static inline int ntrig_get_mode(struct hid_device *hdev) return -EINVAL; hid_hw_request(hdev, report, HID_REQ_GET_REPORT); - usbhid_wait_io(hdev); + hid_hw_wait(hdev); return (int)report->field[0]->value[0]; } @@ -938,7 +938,7 @@ static int ntrig_probe(struct hid_device *hdev, const struct hid_device_id *id) if (report) { /* Let the device settle to ensure the wakeup message gets * through */ - usbhid_wait_io(hdev); + hid_hw_wait(hdev); hid_hw_request(hdev, report, HID_REQ_GET_REPORT); /* diff --git a/drivers/hid/hid-picolcd_fb.c b/drivers/hid/hid-picolcd_fb.c index 98f61de..591f6b2 100644 --- a/drivers/hid/hid-picolcd_fb.c +++ b/drivers/hid/hid-picolcd_fb.c @@ -19,7 +19,6 @@ #include <linux/hid.h> #include <linux/vmalloc.h> -#include "usbhid/usbhid.h" #include <linux/fb.h> #include <linux/module.h> @@ -269,7 +268,7 @@ static void picolcd_fb_update(struct fb_info *info) mutex_unlock(&info->lock); if (!data) return; - usbhid_wait_io(data->hdev); + hid_hw_wait(data->hdev); mutex_lock(&info->lock); n = 0; } @@ -287,7 +286,7 @@ static void picolcd_fb_update(struct fb_info *info) spin_unlock_irqrestore(&fbdata->lock, flags); mutex_unlock(&info->lock); if (data) - usbhid_wait_io(data->hdev); + hid_hw_wait(data->hdev); return; } out: diff --git a/drivers/hid/hid-sensor-hub.c b/drivers/hid/hid-sensor-hub.c index 569cc07..3731139 100644 --- a/drivers/hid/hid-sensor-hub.c +++ b/drivers/hid/hid-sensor-hub.c @@ -18,7 +18,6 @@ */ #include <linux/device.h> #include <linux/hid.h> -#include "usbhid/usbhid.h" #include <linux/module.h> #include <linux/slab.h> #include <linux/mfd/core.h> @@ -204,7 +203,7 @@ int sensor_hub_set_feature(struct hid_sensor_hub_device *hsdev, u32 report_id, } hid_set_field(report->field[field_index], 0, value); hid_hw_request(hsdev->hdev, report, HID_REQ_SET_REPORT); - usbhid_wait_io(hsdev->hdev); + hid_hw_wait(hsdev->hdev); done_proc: mutex_unlock(&data->mutex); @@ -227,7 +226,7 @@ int sensor_hub_get_feature(struct hid_sensor_hub_device *hsdev, u32 report_id, goto done_proc; } hid_hw_request(hsdev->hdev, report, HID_REQ_GET_REPORT); - usbhid_wait_io(hsdev->hdev); + hid_hw_wait(hsdev->hdev); *value = report->field[field_index]->value[0]; done_proc: diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c index da68687..420466b 100644 --- a/drivers/hid/usbhid/hid-core.c +++ b/drivers/hid/usbhid/hid-core.c @@ -705,7 +705,7 @@ static int usb_hidinput_input_event(struct input_dev *dev, unsigned int type, un return 0; } -int usbhid_wait_io(struct hid_device *hid) +static int usbhid_wait_io(struct hid_device *hid) { struct usbhid_device *usbhid = hid->driver_data; @@ -719,7 +719,6 @@ int usbhid_wait_io(struct hid_device *hid) return 0; } -EXPORT_SYMBOL_GPL(usbhid_wait_io); static int hid_set_idle(struct usb_device *dev, int ifnum, int report, int idle) { diff --git a/drivers/hid/usbhid/hid-pidff.c b/drivers/hid/usbhid/hid-pidff.c index 0f1efa3..10b6167 100644 --- a/drivers/hid/usbhid/hid-pidff.c +++ b/drivers/hid/usbhid/hid-pidff.c @@ -471,13 +471,13 @@ static int pidff_request_effect_upload(struct pidff_device *pidff, int efnum) pidff->block_load[PID_EFFECT_BLOCK_INDEX].value[0] = 0; pidff->block_load_status->value[0] = 0; - usbhid_wait_io(pidff->hid); + hid_hw_wait(pidff->hid); for (j = 0; j < 60; j++) { hid_dbg(pidff->hid, "pid_block_load requested\n"); hid_hw_request(pidff->hid, pidff->reports[PID_BLOCK_LOAD], HID_REQ_GET_REPORT); - usbhid_wait_io(pidff->hid); + hid_hw_wait(pidff->hid); if (pidff->block_load_status->value[0] == pidff->status_id[PID_BLOCK_LOAD_SUCCESS]) { hid_dbg(pidff->hid, "device reported free memory: %d bytes\n", @@ -551,7 +551,7 @@ static int pidff_erase_effect(struct input_dev *dev, int effect_id) effect_id, pidff->pid_id[effect_id]); /* Wait for the queue to clear. We do not want a full fifo to prevent the effect removal. */ - usbhid_wait_io(pidff->hid); + hid_hw_wait(pidff->hid); pidff_playback_pid(pidff, pid_id, 0); pidff_erase_pid(pidff, pid_id); @@ -1159,18 +1159,18 @@ static void pidff_reset(struct pidff_device *pidff) pidff->device_control->value[0] = pidff->control_id[PID_RESET]; /* We reset twice as sometimes hid_wait_io isn't waiting long enough */ hid_hw_request(hid, pidff->reports[PID_DEVICE_CONTROL], HID_REQ_SET_REPORT); - usbhid_wait_io(hid); + hid_hw_wait(hid); hid_hw_request(hid, pidff->reports[PID_DEVICE_CONTROL], HID_REQ_SET_REPORT); - usbhid_wait_io(hid); + hid_hw_wait(hid); pidff->device_control->value[0] = pidff->control_id[PID_ENABLE_ACTUATORS]; hid_hw_request(hid, pidff->reports[PID_DEVICE_CONTROL], HID_REQ_SET_REPORT); - usbhid_wait_io(hid); + hid_hw_wait(hid); /* pool report is sometimes messed up, refetch it */ hid_hw_request(hid, pidff->reports[PID_POOL], HID_REQ_GET_REPORT); - usbhid_wait_io(hid); + hid_hw_wait(hid); if (pidff->pool[PID_SIMULTANEOUS_MAX].value) { while (pidff->pool[PID_SIMULTANEOUS_MAX].value[0] < 2) { @@ -1183,7 +1183,7 @@ static void pidff_reset(struct pidff_device *pidff) hid_dbg(pidff->hid, "pid_pool requested again\n"); hid_hw_request(hid, pidff->reports[PID_POOL], HID_REQ_GET_REPORT); - usbhid_wait_io(hid); + hid_hw_wait(hid); } } } diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c index 430d2a9..2f1ddca 100644 --- a/drivers/hid/usbhid/hiddev.c +++ b/drivers/hid/usbhid/hiddev.c @@ -706,7 +706,7 @@ static long hiddev_ioctl(struct file *file, unsigned int cmd, unsigned long arg) break; hid_hw_request(hid, report, HID_REQ_GET_REPORT); - usbhid_wait_io(hid); + hid_hw_wait(hid); r = 0; break; @@ -725,7 +725,7 @@ static long hiddev_ioctl(struct file *file, unsigned int cmd, unsigned long arg) break; hid_hw_request(hid, report, HID_REQ_SET_REPORT); - usbhid_wait_io(hid); + hid_hw_wait(hid); r = 0; break; diff --git a/drivers/hid/usbhid/usbhid.h b/drivers/hid/usbhid/usbhid.h index aa1d5ff..dbb6af6 100644 --- a/drivers/hid/usbhid/usbhid.h +++ b/drivers/hid/usbhid/usbhid.h @@ -34,7 +34,6 @@ #include <linux/input.h> /* API provided by hid-core.c for USB HID drivers */ -int usbhid_wait_io(struct hid_device* hid); void usbhid_close(struct hid_device *hid); int usbhid_open(struct hid_device *hid); void usbhid_init_reports(struct hid_device *hid); -- 1.8.1 ^ permalink raw reply related [flat|nested] 24+ messages in thread
* Re: [PATCH 5/7] HID: use hid_hw_wait() instead of direct call to usbhid 2013-02-08 14:37 ` [PATCH 5/7] HID: use hid_hw_wait() " Benjamin Tissoires @ 2013-02-20 20:18 ` Henrik Rydberg 0 siblings, 0 replies; 24+ messages in thread From: Henrik Rydberg @ 2013-02-20 20:18 UTC (permalink / raw) To: Benjamin Tissoires Cc: Dmitry Torokhov, Jiri Kosina, Stephane Chatty, linux-input, linux-kernel Hi Benjamin, > This removes most of the dependencies between hid drivers and usbhid. > > Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com> > --- Same here, I think a more substantial commit log is in order. Thanks, Henrik ^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH 6/7] HID: multitouch: remove usbhid dependency 2013-02-08 14:37 [PATCH 0/7] hid driver transport cleanup Benjamin Tissoires ` (4 preceding siblings ...) 2013-02-08 14:37 ` [PATCH 5/7] HID: use hid_hw_wait() " Benjamin Tissoires @ 2013-02-08 14:37 ` Benjamin Tissoires 2013-02-20 20:25 ` Henrik Rydberg 2013-02-08 14:37 ` [PATCH 7/7] HID: multitouch: Copyright and note on regression tests Benjamin Tissoires ` (3 subsequent siblings) 9 siblings, 1 reply; 24+ messages in thread From: Benjamin Tissoires @ 2013-02-08 14:37 UTC (permalink / raw) To: Benjamin Tissoires, Dmitry Torokhov, Henrik Rydberg, Jiri Kosina, Stephane Chatty, linux-input, linux-kernel Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com> --- drivers/hid/hid-multitouch.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c index 32258ba..184ac0a 100644 --- a/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c @@ -32,7 +32,6 @@ #include <linux/slab.h> #include <linux/usb.h> #include <linux/input/mt.h> -#include "usbhid/usbhid.h" MODULE_AUTHOR("Stephane Chatty <chatty@enac.fr>"); @@ -907,7 +906,7 @@ static int mt_resume(struct hid_device *hdev) intf = to_usb_interface(hdev->dev.parent); interface = intf->cur_altsetting; - dev = hid_to_usb_dev(hdev); + dev = interface_to_usbdev(intf); /* Some Elan legacy devices require SET_IDLE to be set on resume. * It should be safe to send it to other devices too. -- 1.8.1 ^ permalink raw reply related [flat|nested] 24+ messages in thread
* Re: [PATCH 6/7] HID: multitouch: remove usbhid dependency 2013-02-08 14:37 ` [PATCH 6/7] HID: multitouch: remove usbhid dependency Benjamin Tissoires @ 2013-02-20 20:25 ` Henrik Rydberg 2013-02-25 10:18 ` Benjamin Tissoires 0 siblings, 1 reply; 24+ messages in thread From: Henrik Rydberg @ 2013-02-20 20:25 UTC (permalink / raw) To: Benjamin Tissoires Cc: Dmitry Torokhov, Jiri Kosina, Stephane Chatty, linux-input, linux-kernel Hi Benjamin, > Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com> > --- > drivers/hid/hid-multitouch.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) Since removing the transport layer dependency has a rationale, it might be good to mention that here. Also, what about the explicit usb dependency, was that going to be moved to a usbhid quirk? > > diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c > index 32258ba..184ac0a 100644 > --- a/drivers/hid/hid-multitouch.c > +++ b/drivers/hid/hid-multitouch.c > @@ -32,7 +32,6 @@ > #include <linux/slab.h> > #include <linux/usb.h> > #include <linux/input/mt.h> > -#include "usbhid/usbhid.h" > > > MODULE_AUTHOR("Stephane Chatty <chatty@enac.fr>"); > @@ -907,7 +906,7 @@ static int mt_resume(struct hid_device *hdev) > > intf = to_usb_interface(hdev->dev.parent); > interface = intf->cur_altsetting; > - dev = hid_to_usb_dev(hdev); > + dev = interface_to_usbdev(intf); > > /* Some Elan legacy devices require SET_IDLE to be set on resume. > * It should be safe to send it to other devices too. > -- > 1.8.1 > Thanks, Henrik ^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 6/7] HID: multitouch: remove usbhid dependency 2013-02-20 20:25 ` Henrik Rydberg @ 2013-02-25 10:18 ` Benjamin Tissoires 0 siblings, 0 replies; 24+ messages in thread From: Benjamin Tissoires @ 2013-02-25 10:18 UTC (permalink / raw) To: Henrik Rydberg Cc: Dmitry Torokhov, Jiri Kosina, Stephane Chatty, linux-input, linux-kernel Hi Henrik, On Wed, Feb 20, 2013 at 9:25 PM, Henrik Rydberg <rydberg@euromail.se> wrote: > Hi Benjamin, > >> Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com> >> --- >> drivers/hid/hid-multitouch.c | 3 +-- >> 1 file changed, 1 insertion(+), 2 deletions(-) > > Since removing the transport layer dependency has a rationale, it > might be good to mention that here. Ok, will do. > > Also, what about the explicit usb dependency, was that going to be > moved to a usbhid quirk? Currently, the USB dependency is protected by a check on the BUS. The problem is that the BUS can be faked (by uhid). So yes, I'll add a quirk under usbhid for those devices. Cheers, Benjamin > >> >> diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c >> index 32258ba..184ac0a 100644 >> --- a/drivers/hid/hid-multitouch.c >> +++ b/drivers/hid/hid-multitouch.c >> @@ -32,7 +32,6 @@ >> #include <linux/slab.h> >> #include <linux/usb.h> >> #include <linux/input/mt.h> >> -#include "usbhid/usbhid.h" >> >> >> MODULE_AUTHOR("Stephane Chatty <chatty@enac.fr>"); >> @@ -907,7 +906,7 @@ static int mt_resume(struct hid_device *hdev) >> >> intf = to_usb_interface(hdev->dev.parent); >> interface = intf->cur_altsetting; >> - dev = hid_to_usb_dev(hdev); >> + dev = interface_to_usbdev(intf); >> >> /* Some Elan legacy devices require SET_IDLE to be set on resume. >> * It should be safe to send it to other devices too. >> -- >> 1.8.1 >> > > Thanks, > Henrik ^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH 7/7] HID: multitouch: Copyright and note on regression tests 2013-02-08 14:37 [PATCH 0/7] hid driver transport cleanup Benjamin Tissoires ` (5 preceding siblings ...) 2013-02-08 14:37 ` [PATCH 6/7] HID: multitouch: remove usbhid dependency Benjamin Tissoires @ 2013-02-08 14:37 ` Benjamin Tissoires 2013-02-20 20:26 ` Henrik Rydberg 2013-02-11 10:13 ` [PATCH 0/7] hid driver transport cleanup Mika Westerberg ` (2 subsequent siblings) 9 siblings, 1 reply; 24+ messages in thread From: Benjamin Tissoires @ 2013-02-08 14:37 UTC (permalink / raw) To: Benjamin Tissoires, Dmitry Torokhov, Henrik Rydberg, Jiri Kosina, Stephane Chatty, linux-input, linux-kernel This reflects my new company and officialize the regression tests I'm conducting between each change. Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com> --- drivers/hid/hid-multitouch.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c index 184ac0a..3af9efdd 100644 --- a/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c @@ -2,8 +2,9 @@ * HID driver for multitouch panels * * Copyright (c) 2010-2012 Stephane Chatty <chatty@enac.fr> - * Copyright (c) 2010-2012 Benjamin Tissoires <benjamin.tissoires@gmail.com> + * Copyright (c) 2010-2013 Benjamin Tissoires <benjamin.tissoires@gmail.com> * Copyright (c) 2010-2012 Ecole Nationale de l'Aviation Civile, France + * Copyright (c) 2012-2013 Red Hat, Inc * * This code is partly based on hid-egalax.c: * @@ -26,6 +27,17 @@ * any later version. */ +/* + * This driver is regularly tested thanks to the tool hid-test[1]. + * This tool relies on hid-replay[2] and a database of hid devices[3]. + * Please run these regression tests before patching this module so that + * your patch won't break existing known devices. + * + * [1] https://github.com/bentiss/hid-test + * [2] https://github.com/bentiss/hid-replay + * [3] https://github.com/bentiss/hid-devices + */ + #include <linux/device.h> #include <linux/hid.h> #include <linux/module.h> -- 1.8.1 ^ permalink raw reply related [flat|nested] 24+ messages in thread
* Re: [PATCH 7/7] HID: multitouch: Copyright and note on regression tests 2013-02-08 14:37 ` [PATCH 7/7] HID: multitouch: Copyright and note on regression tests Benjamin Tissoires @ 2013-02-20 20:26 ` Henrik Rydberg 0 siblings, 0 replies; 24+ messages in thread From: Henrik Rydberg @ 2013-02-20 20:26 UTC (permalink / raw) To: Benjamin Tissoires Cc: Dmitry Torokhov, Jiri Kosina, Stephane Chatty, linux-input, linux-kernel On Fri, Feb 08, 2013 at 03:37:36PM +0100, Benjamin Tissoires wrote: > This reflects my new company and officialize the regression tests I'm > conducting between each change. > > Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com> > --- > drivers/hid/hid-multitouch.c | 14 +++++++++++++- > 1 file changed, 13 insertions(+), 1 deletion(-) > > diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c > index 184ac0a..3af9efdd 100644 > --- a/drivers/hid/hid-multitouch.c > +++ b/drivers/hid/hid-multitouch.c > @@ -2,8 +2,9 @@ > * HID driver for multitouch panels > * > * Copyright (c) 2010-2012 Stephane Chatty <chatty@enac.fr> > - * Copyright (c) 2010-2012 Benjamin Tissoires <benjamin.tissoires@gmail.com> > + * Copyright (c) 2010-2013 Benjamin Tissoires <benjamin.tissoires@gmail.com> > * Copyright (c) 2010-2012 Ecole Nationale de l'Aviation Civile, France > + * Copyright (c) 2012-2013 Red Hat, Inc > * > * This code is partly based on hid-egalax.c: > * > @@ -26,6 +27,17 @@ > * any later version. > */ > > +/* > + * This driver is regularly tested thanks to the tool hid-test[1]. > + * This tool relies on hid-replay[2] and a database of hid devices[3]. > + * Please run these regression tests before patching this module so that > + * your patch won't break existing known devices. > + * > + * [1] https://github.com/bentiss/hid-test > + * [2] https://github.com/bentiss/hid-replay > + * [3] https://github.com/bentiss/hid-devices > + */ > + > #include <linux/device.h> > #include <linux/hid.h> > #include <linux/module.h> > -- > 1.8.1 > Acked-by: Henrik Rydberg <rydberg@euromail.se> Thanks, Henrik ^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 0/7] hid driver transport cleanup 2013-02-08 14:37 [PATCH 0/7] hid driver transport cleanup Benjamin Tissoires ` (6 preceding siblings ...) 2013-02-08 14:37 ` [PATCH 7/7] HID: multitouch: Copyright and note on regression tests Benjamin Tissoires @ 2013-02-11 10:13 ` Mika Westerberg 2013-02-11 11:19 ` Benjamin Tissoires 2013-02-18 9:13 ` Jiri Kosina 2013-02-20 20:31 ` Henrik Rydberg 9 siblings, 1 reply; 24+ messages in thread From: Mika Westerberg @ 2013-02-11 10:13 UTC (permalink / raw) To: Benjamin Tissoires Cc: Dmitry Torokhov, Henrik Rydberg, Jiri Kosina, Stephane Chatty, linux-input, linux-kernel On Fri, Feb 08, 2013 at 03:37:29PM +0100, Benjamin Tissoires wrote: > so, here is the hid drivers cleanup. The aim is to remove as much as possible > direct calls to usbhid for hid drivers. Thus, other transport layers can use > the existing hid drivers (like I2C or uhid). We also found out that there is a dependency to usbhid in many of the drivers, especially in sensor-hub which caused the system crash while the driver tried to transmit over USB even though it was behind I2C. Your series fixes that nicely :) You can add, Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com> for the whole series and in addition, Tested-by: Mika Westerberg <mika.westerberg@linux.intel.com> for the sensor-hub part (HID over I2C). I have few more patches to the sensor-hub myself and I'm going to rebase them on top of this series. ^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 0/7] hid driver transport cleanup 2013-02-11 10:13 ` [PATCH 0/7] hid driver transport cleanup Mika Westerberg @ 2013-02-11 11:19 ` Benjamin Tissoires 2013-02-11 11:29 ` Mika Westerberg 0 siblings, 1 reply; 24+ messages in thread From: Benjamin Tissoires @ 2013-02-11 11:19 UTC (permalink / raw) To: Mika Westerberg Cc: Dmitry Torokhov, Henrik Rydberg, Jiri Kosina, Stephane Chatty, linux-input, linux-kernel On Mon, Feb 11, 2013 at 11:13 AM, Mika Westerberg <mika.westerberg@linux.intel.com> wrote: > On Fri, Feb 08, 2013 at 03:37:29PM +0100, Benjamin Tissoires wrote: >> so, here is the hid drivers cleanup. The aim is to remove as much as possible >> direct calls to usbhid for hid drivers. Thus, other transport layers can use >> the existing hid drivers (like I2C or uhid). > > We also found out that there is a dependency to usbhid in many of the > drivers, especially in sensor-hub which caused the system crash while the > driver tried to transmit over USB even though it was behind I2C. > > Your series fixes that nicely :) > > You can add, > > Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com> > > for the whole series and in addition, > > Tested-by: Mika Westerberg <mika.westerberg@linux.intel.com> > > for the sensor-hub part (HID over I2C). I have few more patches to the > sensor-hub myself and I'm going to rebase them on top of this series. Thanks Mika for reviewing. I just wanted to warn you that the HID over I2C part is still lacking the support of requests through hid_hw_request(). So the functions sensor_hub_set_feature(), sensor_hub_get_feature() and sensor_hub_input_attr_get_raw_value() won't work, in a silently way :(. I started writing the patch but stopped at some point due to lack of ways to test it. Cheers, Benjamin ^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 0/7] hid driver transport cleanup 2013-02-11 11:19 ` Benjamin Tissoires @ 2013-02-11 11:29 ` Mika Westerberg 0 siblings, 0 replies; 24+ messages in thread From: Mika Westerberg @ 2013-02-11 11:29 UTC (permalink / raw) To: Benjamin Tissoires Cc: Dmitry Torokhov, Henrik Rydberg, Jiri Kosina, Stephane Chatty, linux-input, linux-kernel On Mon, Feb 11, 2013 at 12:19:13PM +0100, Benjamin Tissoires wrote: > On Mon, Feb 11, 2013 at 11:13 AM, Mika Westerberg > <mika.westerberg@linux.intel.com> wrote: > > On Fri, Feb 08, 2013 at 03:37:29PM +0100, Benjamin Tissoires wrote: > >> so, here is the hid drivers cleanup. The aim is to remove as much as possible > >> direct calls to usbhid for hid drivers. Thus, other transport layers can use > >> the existing hid drivers (like I2C or uhid). > > > > We also found out that there is a dependency to usbhid in many of the > > drivers, especially in sensor-hub which caused the system crash while the > > driver tried to transmit over USB even though it was behind I2C. > > > > Your series fixes that nicely :) > > > > You can add, > > > > Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com> > > > > for the whole series and in addition, > > > > Tested-by: Mika Westerberg <mika.westerberg@linux.intel.com> > > > > for the sensor-hub part (HID over I2C). I have few more patches to the > > sensor-hub myself and I'm going to rebase them on top of this series. > > Thanks Mika for reviewing. > > I just wanted to warn you that the HID over I2C part is still lacking > the support of requests through hid_hw_request(). So the functions > sensor_hub_set_feature(), sensor_hub_get_feature() and > sensor_hub_input_attr_get_raw_value() won't work, in a silently way > :(. OK. > I started writing the patch but stopped at some point due to lack of > ways to test it. Well, I have the HW here so if you have something please send to me. I can test it. ^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 0/7] hid driver transport cleanup 2013-02-08 14:37 [PATCH 0/7] hid driver transport cleanup Benjamin Tissoires ` (7 preceding siblings ...) 2013-02-11 10:13 ` [PATCH 0/7] hid driver transport cleanup Mika Westerberg @ 2013-02-18 9:13 ` Jiri Kosina 2013-02-18 20:49 ` Henrik Rydberg 2013-02-20 20:31 ` Henrik Rydberg 9 siblings, 1 reply; 24+ messages in thread From: Jiri Kosina @ 2013-02-18 9:13 UTC (permalink / raw) To: Benjamin Tissoires Cc: Dmitry Torokhov, Henrik Rydberg, Stephane Chatty, linux-input, linux-kernel On Fri, 8 Feb 2013, Benjamin Tissoires wrote: > Hi guys, > > so, here is the hid drivers cleanup. The aim is to remove as much as possible > direct calls to usbhid for hid drivers. Thus, other transport layers can use > the existing hid drivers (like I2C or uhid). > > Henrik, patches 1 to 5 are yours. I just rebased and double-checked them. Please > add you Signed-off-by if you are happy with the rebase. Henrik, I can see your signoff in my inbox only for patches 1 and 2. Are you still reviewing patches 3-5? Also, I'd like to make sure that we don't mess up the authorship, so patches 1-5 should be applied with Henrik's authorship, right? (I can do it after I receive signoffs from Henrik for those). Thanks a lot for this work. -- Jiri Kosina SUSE Labs ^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 0/7] hid driver transport cleanup 2013-02-18 9:13 ` Jiri Kosina @ 2013-02-18 20:49 ` Henrik Rydberg 0 siblings, 0 replies; 24+ messages in thread From: Henrik Rydberg @ 2013-02-18 20:49 UTC (permalink / raw) To: Jiri Kosina Cc: Benjamin Tissoires, Dmitry Torokhov, Stephane Chatty, linux-input, linux-kernel Hi Jiri, > > so, here is the hid drivers cleanup. The aim is to remove as much as possible > > direct calls to usbhid for hid drivers. Thus, other transport layers can use > > the existing hid drivers (like I2C or uhid). > > > > Henrik, patches 1 to 5 are yours. I just rebased and double-checked them. Please > > add you Signed-off-by if you are happy with the rebase. > > Henrik, > > I can see your signoff in my inbox only for patches 1 and 2. Are you still > reviewing patches 3-5? Yes, unfortunately the pipe is pretty full. > Also, I'd like to make sure that we don't mess up the authorship, so > patches 1-5 should be applied with Henrik's authorship, right? (I can do > it after I receive signoffs from Henrik for those). Benjamin has gone through the effort of keeping the patches up-to-date, so I don't mind him being the author on most of them. Maybe the first patch is actually identical to my earlier submission, at least I seem to have it in my computer. :-) Thanks, Henrik ^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 0/7] hid driver transport cleanup 2013-02-08 14:37 [PATCH 0/7] hid driver transport cleanup Benjamin Tissoires ` (8 preceding siblings ...) 2013-02-18 9:13 ` Jiri Kosina @ 2013-02-20 20:31 ` Henrik Rydberg 2013-02-25 10:20 ` Benjamin Tissoires 9 siblings, 1 reply; 24+ messages in thread From: Henrik Rydberg @ 2013-02-20 20:31 UTC (permalink / raw) To: Benjamin Tissoires Cc: Dmitry Torokhov, Jiri Kosina, Stephane Chatty, linux-input, linux-kernel Hi Benjamin, > so, here is the hid drivers cleanup. The aim is to remove as much as possible > direct calls to usbhid for hid drivers. Thus, other transport layers can use > the existing hid drivers (like I2C or uhid). > > Henrik, patches 1 to 5 are yours. I just rebased and double-checked them. Please > add you Signed-off-by if you are happy with the rebase. I wanted to Ack 4-6 as well, but I think they warrant a bit more elaborate commit messages. Other than that, it looks all good to me. Cheers, Henrik ^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 0/7] hid driver transport cleanup 2013-02-20 20:31 ` Henrik Rydberg @ 2013-02-25 10:20 ` Benjamin Tissoires 0 siblings, 0 replies; 24+ messages in thread From: Benjamin Tissoires @ 2013-02-25 10:20 UTC (permalink / raw) To: Henrik Rydberg Cc: Dmitry Torokhov, Jiri Kosina, Stephane Chatty, linux-input, linux-kernel Hi Henrik, On Wed, Feb 20, 2013 at 9:31 PM, Henrik Rydberg <rydberg@euromail.se> wrote: > Hi Benjamin, > >> so, here is the hid drivers cleanup. The aim is to remove as much as possible >> direct calls to usbhid for hid drivers. Thus, other transport layers can use >> the existing hid drivers (like I2C or uhid). >> >> Henrik, patches 1 to 5 are yours. I just rebased and double-checked them. Please >> add you Signed-off-by if you are happy with the rebase. > > I wanted to Ack 4-6 as well, but I think they warrant a bit more > elaborate commit messages. Other than that, it looks all good to me. Thanks for the review. I'll push a v2 today with the requested changes. Cheers, Benjamin ^ permalink raw reply [flat|nested] 24+ messages in thread
end of thread, other threads:[~2013-02-25 10:20 UTC | newest] Thread overview: 24+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2013-02-08 14:37 [PATCH 0/7] hid driver transport cleanup Benjamin Tissoires 2013-02-08 14:37 ` [PATCH 1/7] HID: Extend the interface with report requests Benjamin Tissoires 2013-02-15 19:46 ` Henrik Rydberg 2013-02-08 14:37 ` [PATCH 2/7] HID: Extend the interface with wait io request Benjamin Tissoires 2013-02-15 20:47 ` Henrik Rydberg 2013-02-08 14:37 ` [PATCH 3/7] HID: Kconfig: Remove explicit transport layer dependencies Benjamin Tissoires 2013-02-20 20:06 ` Henrik Rydberg 2013-02-25 10:15 ` Benjamin Tissoires 2013-02-08 14:37 ` [PATCH 4/7] hid: use hid_hw_request() instead of direct call to usbhid Benjamin Tissoires 2013-02-20 20:16 ` Henrik Rydberg 2013-02-08 14:37 ` [PATCH 5/7] HID: use hid_hw_wait() " Benjamin Tissoires 2013-02-20 20:18 ` Henrik Rydberg 2013-02-08 14:37 ` [PATCH 6/7] HID: multitouch: remove usbhid dependency Benjamin Tissoires 2013-02-20 20:25 ` Henrik Rydberg 2013-02-25 10:18 ` Benjamin Tissoires 2013-02-08 14:37 ` [PATCH 7/7] HID: multitouch: Copyright and note on regression tests Benjamin Tissoires 2013-02-20 20:26 ` Henrik Rydberg 2013-02-11 10:13 ` [PATCH 0/7] hid driver transport cleanup Mika Westerberg 2013-02-11 11:19 ` Benjamin Tissoires 2013-02-11 11:29 ` Mika Westerberg 2013-02-18 9:13 ` Jiri Kosina 2013-02-18 20:49 ` Henrik Rydberg 2013-02-20 20:31 ` Henrik Rydberg 2013-02-25 10:20 ` Benjamin Tissoires
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.