Re: [PATCH 2/4] HID: uclogic: merge hid-huion driver in hid-uclogic
From: Nikolai Kondrashov <hidden>
Date: 2015-02-25 21:04:50
Also in:
lkml
On 02/25/2015 02:05 AM, Benjamin Tissoires wrote:
quoted hunk ↗ jump to hunk
From: Nikolai Kondrashov <redacted> Merge the hid-huion driver into hid-uclogic as all the devices supported by hid-huion are in fact UC-Logic devices. Signed-off-by: Benjamin Tissoires <redacted> --- Changed from the original patch: - update Makefile, Kconfig accordingly - remove one extra pr_err when kzalloc failed (raised by checkpatch.pl) drivers/hid/Kconfig | 8 +- drivers/hid/Makefile | 1 - drivers/hid/hid-huion.c | 290 ---------------------------------------------- drivers/hid/hid-uclogic.c | 229 +++++++++++++++++++++++++++++++++++- 4 files changed, 229 insertions(+), 299 deletions(-) delete mode 100644 drivers/hid/hid-huion.cdiff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index 152b006..8a55fd7 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig@@ -286,12 +286,6 @@ config HID_GT683R Currently the following devices are know to be supported: - MSI GT683R -config HID_HUION - tristate "Huion tablets" - depends on USB_HID - ---help--- - Support for Huion 580 tablet. - config HID_KEYTOUCH tristate "Keytouch HID devices" depends on HID@@ -314,7 +308,7 @@ config HID_UCLOGIC tristate "UC-Logic" depends on HID ---help--- - Support for UC-Logic tablets. + Support for UC-Logic and Huion tablets.
I'm not sure this is worth changing. We'll need to at least add Yiynova and Ugee here later, which we're likely to forget. Meanwhile, essentially, they're UC-Logic underneath. Apart from this (which can be left as is, IMHO): Reviewed-by: Nikolai Kondrashov <redacted> BTW, will you be submitting changes to digimend-kernel-drivers to align it with what you're submitting upstream? Nick