* [PATCH 4/4] HID: remove ThingM blink(1) driver
@ 2016-06-21 19:50 Heiner Kallweit
2016-06-22 13:25 ` Jiri Kosina
0 siblings, 1 reply; 6+ messages in thread
From: Heiner Kallweit @ 2016-06-21 19:50 UTC (permalink / raw)
To: Benjamin Tissoires; +Cc: Jiri Kosina, linux-input
Now that support for ThingM blink(1) was merged into the hid-led driver
the dedicated driver for this device can be removed.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
drivers/hid/Kconfig | 10 --
drivers/hid/Makefile | 1 -
drivers/hid/hid-thingm.c | 259 -----------------------------------------------
3 files changed, 270 deletions(-)
delete mode 100644 drivers/hid/hid-thingm.c
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index ab22090..6b08a3b 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -828,16 +828,6 @@ config HID_TOPSEED
Say Y if you have a TopSeed Cyberlink or BTC Emprex or Conceptronic
CLLRCMCE remote control.
-config HID_THINGM
- tristate "ThingM blink(1) USB RGB LED"
- depends on HID
- depends on LEDS_CLASS
- ---help---
- Support for the ThingM blink(1) USB RGB LED. This driver registers a
- Linux LED class instance, plus additional sysfs attributes to control
- RGB colors, fade time and playing. The device is exposed through hidraw
- to access other functions.
-
config HID_THRUSTMASTER
tristate "ThrustMaster devices support"
depends on HID
diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile
index 85580ec..fc4b2aa 100644
--- a/drivers/hid/Makefile
+++ b/drivers/hid/Makefile
@@ -91,7 +91,6 @@ obj-$(CONFIG_HID_SPEEDLINK) += hid-speedlink.o
obj-$(CONFIG_HID_STEELSERIES) += hid-steelseries.o
obj-$(CONFIG_HID_SUNPLUS) += hid-sunplus.o
obj-$(CONFIG_HID_GREENASIA) += hid-gaff.o
-obj-$(CONFIG_HID_THINGM) += hid-thingm.o
obj-$(CONFIG_HID_THRUSTMASTER) += hid-tmff.o
obj-$(CONFIG_HID_TIVO) += hid-tivo.o
obj-$(CONFIG_HID_TOPSEED) += hid-topseed.o
diff --git a/drivers/hid/hid-thingm.c b/drivers/hid/hid-thingm.c
deleted file mode 100644
index 9b4fec4..0000000
--- a/drivers/hid/hid-thingm.c
+++ /dev/null
@@ -1,259 +0,0 @@
-/*
- * ThingM blink(1) USB RGB LED driver
- *
- * Copyright 2013-2014 Savoir-faire Linux Inc.
- * Vivien Didelot <vivien.didelot@savoirfairelinux.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, version 2.
- */
-
-#include <linux/hid.h>
-#include <linux/hidraw.h>
-#include <linux/leds.h>
-#include <linux/module.h>
-#include <linux/mutex.h>
-
-#include "hid-ids.h"
-
-#define REPORT_ID 1
-#define REPORT_SIZE 9
-
-/* Firmware major number of supported devices */
-#define THINGM_MAJOR_MK1 '1'
-#define THINGM_MAJOR_MK2 '2'
-
-struct thingm_fwinfo {
- char major;
- unsigned numrgb;
- unsigned first;
-};
-
-static const struct thingm_fwinfo thingm_fwinfo[] = {
- {
- .major = THINGM_MAJOR_MK1,
- .numrgb = 1,
- .first = 0,
- }, {
- .major = THINGM_MAJOR_MK2,
- .numrgb = 2,
- .first = 1,
- }
-};
-
-/* A red, green or blue channel, part of an RGB chip */
-struct thingm_led {
- struct thingm_rgb *rgb;
- struct led_classdev ldev;
- char name[32];
-};
-
-/* Basically a WS2812 5050 RGB LED chip */
-struct thingm_rgb {
- struct thingm_device *tdev;
- struct thingm_led red;
- struct thingm_led green;
- struct thingm_led blue;
- u8 num;
-};
-
-struct thingm_device {
- struct hid_device *hdev;
- struct {
- char major;
- char minor;
- } version;
- const struct thingm_fwinfo *fwinfo;
- struct mutex lock;
- struct thingm_rgb *rgb;
-};
-
-static int thingm_send(struct thingm_device *tdev, u8 buf[REPORT_SIZE])
-{
- int ret;
-
- hid_dbg(tdev->hdev, "-> %d %c %7ph\n", buf[0], buf[1], &buf[2]);
-
- mutex_lock(&tdev->lock);
-
- ret = hid_hw_raw_request(tdev->hdev, buf[0], buf, REPORT_SIZE,
- HID_FEATURE_REPORT, HID_REQ_SET_REPORT);
-
- mutex_unlock(&tdev->lock);
-
- return ret < 0 ? ret : 0;
-}
-
-static int thingm_recv(struct thingm_device *tdev, u8 buf[REPORT_SIZE])
-{
- int ret;
-
- /*
- * A read consists of two operations: sending the read command
- * and the actual read from the device. Use the mutex to protect
- * the full sequence of both operations.
- */
- mutex_lock(&tdev->lock);
-
- ret = hid_hw_raw_request(tdev->hdev, buf[0], buf, REPORT_SIZE,
- HID_FEATURE_REPORT, HID_REQ_SET_REPORT);
- if (ret < 0)
- goto err;
-
- ret = hid_hw_raw_request(tdev->hdev, buf[0], buf, REPORT_SIZE,
- HID_FEATURE_REPORT, HID_REQ_GET_REPORT);
- if (ret < 0)
- goto err;
-
- ret = 0;
-
- hid_dbg(tdev->hdev, "<- %d %c %7ph\n", buf[0], buf[1], &buf[2]);
-err:
- mutex_unlock(&tdev->lock);
- return ret;
-}
-
-static int thingm_version(struct thingm_device *tdev)
-{
- u8 buf[REPORT_SIZE] = { REPORT_ID, 'v', 0, 0, 0, 0, 0, 0, 0 };
- int err;
-
- err = thingm_recv(tdev, buf);
- if (err)
- return err;
-
- tdev->version.major = buf[3];
- tdev->version.minor = buf[4];
-
- return 0;
-}
-
-static int thingm_write_color(struct thingm_rgb *rgb)
-{
- u8 buf[REPORT_SIZE] = { REPORT_ID, 'c', 0, 0, 0, 0, 0, rgb->num, 0 };
-
- buf[2] = rgb->red.ldev.brightness;
- buf[3] = rgb->green.ldev.brightness;
- buf[4] = rgb->blue.ldev.brightness;
-
- return thingm_send(rgb->tdev, buf);
-}
-
-static int thingm_led_set(struct led_classdev *ldev,
- enum led_brightness brightness)
-{
- struct thingm_led *led = container_of(ldev, struct thingm_led, ldev);
-
- return thingm_write_color(led->rgb);
-}
-
-static int thingm_init_led(struct thingm_led *led, const char *color_name,
- struct thingm_rgb *rgb, int minor)
-{
- snprintf(led->name, sizeof(led->name), "thingm%d:%s:led%d",
- minor, color_name, rgb->num);
- led->ldev.name = led->name;
- led->ldev.max_brightness = 255;
- led->ldev.brightness_set_blocking = thingm_led_set;
- led->ldev.flags = LED_HW_PLUGGABLE;
- led->rgb = rgb;
- return devm_led_classdev_register(&rgb->tdev->hdev->dev, &led->ldev);
-}
-
-static int thingm_init_rgb(struct thingm_rgb *rgb)
-{
- const int minor = ((struct hidraw *) rgb->tdev->hdev->hidraw)->minor;
- int err;
-
- /* Register the red diode */
- err = thingm_init_led(&rgb->red, "red", rgb, minor);
- if (err)
- return err;
-
- /* Register the green diode */
- err = thingm_init_led(&rgb->green, "green", rgb, minor);
- if (err)
- return err;
-
- /* Register the blue diode */
- return thingm_init_led(&rgb->blue, "blue", rgb, minor);
-}
-
-static int thingm_probe(struct hid_device *hdev, const struct hid_device_id *id)
-{
- struct thingm_device *tdev;
- int i, err;
-
- tdev = devm_kzalloc(&hdev->dev, sizeof(struct thingm_device),
- GFP_KERNEL);
- if (!tdev)
- return -ENOMEM;
-
- tdev->hdev = hdev;
- hid_set_drvdata(hdev, tdev);
-
- err = hid_parse(hdev);
- if (err)
- return err;
-
- mutex_init(&tdev->lock);
-
- err = thingm_version(tdev);
- if (err)
- return err;
-
- hid_dbg(hdev, "firmware version: %c.%c\n",
- tdev->version.major, tdev->version.minor);
-
- for (i = 0; i < ARRAY_SIZE(thingm_fwinfo) && !tdev->fwinfo; ++i)
- if (thingm_fwinfo[i].major == tdev->version.major)
- tdev->fwinfo = &thingm_fwinfo[i];
-
- if (!tdev->fwinfo) {
- hid_err(hdev, "unsupported firmware %c\n", tdev->version.major);
- return -ENODEV;
- }
-
- tdev->rgb = devm_kzalloc(&hdev->dev,
- sizeof(struct thingm_rgb) * tdev->fwinfo->numrgb,
- GFP_KERNEL);
- if (!tdev->rgb)
- return -ENOMEM;
-
- err = hid_hw_start(hdev, HID_CONNECT_HIDRAW);
- if (err)
- return err;
-
- for (i = 0; i < tdev->fwinfo->numrgb; ++i) {
- struct thingm_rgb *rgb = tdev->rgb + i;
-
- rgb->tdev = tdev;
- rgb->num = tdev->fwinfo->first + i;
- err = thingm_init_rgb(rgb);
- if (err) {
- hid_hw_stop(hdev);
- return err;
- }
- }
-
- return 0;
-}
-
-static const struct hid_device_id thingm_table[] = {
- { HID_USB_DEVICE(USB_VENDOR_ID_THINGM, USB_DEVICE_ID_BLINK1) },
- { }
-};
-MODULE_DEVICE_TABLE(hid, thingm_table);
-
-static struct hid_driver thingm_driver = {
- .name = "thingm",
- .probe = thingm_probe,
- .id_table = thingm_table,
-};
-
-module_hid_driver(thingm_driver);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Vivien Didelot <vivien.didelot@savoirfairelinux.com>");
-MODULE_DESCRIPTION("ThingM blink(1) USB RGB LED driver");
--
2.9.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 4/4] HID: remove ThingM blink(1) driver
2016-06-21 19:50 [PATCH 4/4] HID: remove ThingM blink(1) driver Heiner Kallweit
@ 2016-06-22 13:25 ` Jiri Kosina
2016-06-22 15:42 ` Vivien Didelot
2016-06-22 19:52 ` Heiner Kallweit
0 siblings, 2 replies; 6+ messages in thread
From: Jiri Kosina @ 2016-06-22 13:25 UTC (permalink / raw)
To: Heiner Kallweit
Cc: Benjamin Tissoires, linux-input, linux-kernel, Vivien Didelot
On Tue, 21 Jun 2016, Heiner Kallweit wrote:
> Now that support for ThingM blink(1) was merged into the hid-led driver
> the dedicated driver for this device can be removed.
>
> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
> ---
> drivers/hid/Kconfig | 10 --
> drivers/hid/Makefile | 1 -
> drivers/hid/hid-thingm.c | 259 -----------------------------------------------
> 3 files changed, 270 deletions(-)
> delete mode 100644 drivers/hid/hid-thingm.c
>
> diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
> index ab22090..6b08a3b 100644
> --- a/drivers/hid/Kconfig
> +++ b/drivers/hid/Kconfig
> @@ -828,16 +828,6 @@ config HID_TOPSEED
> Say Y if you have a TopSeed Cyberlink or BTC Emprex or Conceptronic
> CLLRCMCE remote control.
>
> -config HID_THINGM
Overall the patchset looks good to me. I'd suggest we keep
CONFIG_HID_THINGM as a stub though, that'd just select CONFIG_HID_LED, so
that we don't cause kernel config regressions for users who had
CONFIG_HID_THINGM already turned on.
Also adding Vivien Didelot to CC, as the author of the original driver.
Vivien, the full set can be found in linux-input archives (
http://marc.info/?l=linux-input&r=1&b=201606&w=2 )
--
Jiri Kosina
SUSE Labs
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 4/4] HID: remove ThingM blink(1) driver
2016-06-22 13:25 ` Jiri Kosina
@ 2016-06-22 15:42 ` Vivien Didelot
2016-06-22 19:54 ` Heiner Kallweit
2016-06-22 19:52 ` Heiner Kallweit
1 sibling, 1 reply; 6+ messages in thread
From: Vivien Didelot @ 2016-06-22 15:42 UTC (permalink / raw)
To: Jiri Kosina, Heiner Kallweit
Cc: Benjamin Tissoires, linux-input, linux-kernel
Hi,
Jiri Kosina <jikos@kernel.org> writes:
> On Tue, 21 Jun 2016, Heiner Kallweit wrote:
>
>> Now that support for ThingM blink(1) was merged into the hid-led driver
>> the dedicated driver for this device can be removed.
>>
>> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
>> ---
>> drivers/hid/Kconfig | 10 --
>> drivers/hid/Makefile | 1 -
>> drivers/hid/hid-thingm.c | 259 -----------------------------------------------
>> 3 files changed, 270 deletions(-)
>> delete mode 100644 drivers/hid/hid-thingm.c
>>
>> diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
>> index ab22090..6b08a3b 100644
>> --- a/drivers/hid/Kconfig
>> +++ b/drivers/hid/Kconfig
>> @@ -828,16 +828,6 @@ config HID_TOPSEED
>> Say Y if you have a TopSeed Cyberlink or BTC Emprex or Conceptronic
>> CLLRCMCE remote control.
>>
>> -config HID_THINGM
>
> Overall the patchset looks good to me. I'd suggest we keep
> CONFIG_HID_THINGM as a stub though, that'd just select CONFIG_HID_LED, so
> that we don't cause kernel config regressions for users who had
> CONFIG_HID_THINGM already turned on.
>
> Also adding Vivien Didelot to CC, as the author of the original driver.
> Vivien, the full set can be found in linux-input archives (
> http://marc.info/?l=linux-input&r=1&b=201606&w=2 )
Thanks a lot for the follow-up Jiri.
If you guys decide to remove hid-thingm.c, you need to update the
MAINTAINERS entry, checkpatch.pl should have warned about that.
I can hardly test the patchset now. Heiner, can you confirm me that with
your patchset, we will still see 3 led_classdev in sysfs for the
blink(1) mk1 (which has one RGB chip) and 6 for mk2 (which has 2 chips)?
Thanks,
Vivien
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 4/4] HID: remove ThingM blink(1) driver
2016-06-22 13:25 ` Jiri Kosina
2016-06-22 15:42 ` Vivien Didelot
@ 2016-06-22 19:52 ` Heiner Kallweit
1 sibling, 0 replies; 6+ messages in thread
From: Heiner Kallweit @ 2016-06-22 19:52 UTC (permalink / raw)
To: Jiri Kosina; +Cc: Benjamin Tissoires, linux-input, linux-kernel, Vivien Didelot
Am 22.06.2016 um 15:25 schrieb Jiri Kosina:
> On Tue, 21 Jun 2016, Heiner Kallweit wrote:
>
>> Now that support for ThingM blink(1) was merged into the hid-led driver
>> the dedicated driver for this device can be removed.
>>
>> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
>> ---
>> drivers/hid/Kconfig | 10 --
>> drivers/hid/Makefile | 1 -
>> drivers/hid/hid-thingm.c | 259 -----------------------------------------------
>> 3 files changed, 270 deletions(-)
>> delete mode 100644 drivers/hid/hid-thingm.c
>>
>> diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
>> index ab22090..6b08a3b 100644
>> --- a/drivers/hid/Kconfig
>> +++ b/drivers/hid/Kconfig
>> @@ -828,16 +828,6 @@ config HID_TOPSEED
>> Say Y if you have a TopSeed Cyberlink or BTC Emprex or Conceptronic
>> CLLRCMCE remote control.
>>
>> -config HID_THINGM
>
> Overall the patchset looks good to me. I'd suggest we keep
> CONFIG_HID_THINGM as a stub though, that'd just select CONFIG_HID_LED, so
> that we don't cause kernel config regressions for users who had
> CONFIG_HID_THINGM already turned on.
>
OK
I'll add this and provide a v2 of the patch removing the old thingm driver.
> Also adding Vivien Didelot to CC, as the author of the original driver.
> Vivien, the full set can be found in linux-input archives (
> http://marc.info/?l=linux-input&r=1&b=201606&w=2 )
>
Sorry, forgot that.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 4/4] HID: remove ThingM blink(1) driver
2016-06-22 15:42 ` Vivien Didelot
@ 2016-06-22 19:54 ` Heiner Kallweit
2016-06-22 20:03 ` Vivien Didelot
0 siblings, 1 reply; 6+ messages in thread
From: Heiner Kallweit @ 2016-06-22 19:54 UTC (permalink / raw)
To: Vivien Didelot, Jiri Kosina; +Cc: Benjamin Tissoires, linux-input, linux-kernel
Am 22.06.2016 um 17:42 schrieb Vivien Didelot:
> Hi,
>
> Jiri Kosina <jikos@kernel.org> writes:
>
>> On Tue, 21 Jun 2016, Heiner Kallweit wrote:
>>
>>> Now that support for ThingM blink(1) was merged into the hid-led driver
>>> the dedicated driver for this device can be removed.
>>>
>>> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
>>> ---
>>> drivers/hid/Kconfig | 10 --
>>> drivers/hid/Makefile | 1 -
>>> drivers/hid/hid-thingm.c | 259 -----------------------------------------------
>>> 3 files changed, 270 deletions(-)
>>> delete mode 100644 drivers/hid/hid-thingm.c
>>>
>>> diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
>>> index ab22090..6b08a3b 100644
>>> --- a/drivers/hid/Kconfig
>>> +++ b/drivers/hid/Kconfig
>>> @@ -828,16 +828,6 @@ config HID_TOPSEED
>>> Say Y if you have a TopSeed Cyberlink or BTC Emprex or Conceptronic
>>> CLLRCMCE remote control.
>>>
>>> -config HID_THINGM
>>
>> Overall the patchset looks good to me. I'd suggest we keep
>> CONFIG_HID_THINGM as a stub though, that'd just select CONFIG_HID_LED, so
>> that we don't cause kernel config regressions for users who had
>> CONFIG_HID_THINGM already turned on.
>>
>> Also adding Vivien Didelot to CC, as the author of the original driver.
>> Vivien, the full set can be found in linux-input archives (
>> http://marc.info/?l=linux-input&r=1&b=201606&w=2 )
>
> Thanks a lot for the follow-up Jiri.
>
> If you guys decide to remove hid-thingm.c, you need to update the
> MAINTAINERS entry, checkpatch.pl should have warned about that.
>
Right, thanks for the hint.
> I can hardly test the patchset now. Heiner, can you confirm me that with
> your patchset, we will still see 3 led_classdev in sysfs for the
> blink(1) mk1 (which has one RGB chip) and 6 for mk2 (which has 2 chips)?
>
Yes, this will still be the case.
Regards, Heiner
> Thanks,
>
> Vivien
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 4/4] HID: remove ThingM blink(1) driver
2016-06-22 19:54 ` Heiner Kallweit
@ 2016-06-22 20:03 ` Vivien Didelot
0 siblings, 0 replies; 6+ messages in thread
From: Vivien Didelot @ 2016-06-22 20:03 UTC (permalink / raw)
To: Heiner Kallweit, Jiri Kosina
Cc: Benjamin Tissoires, linux-input, linux-kernel
Hi Heiner,
Heiner Kallweit <hkallweit1@gmail.com> writes:
>>> Also adding Vivien Didelot to CC, as the author of the original driver.
>>> Vivien, the full set can be found in linux-input archives (
>>> http://marc.info/?l=linux-input&r=1&b=201606&w=2 )
>>
>> Thanks a lot for the follow-up Jiri.
>>
>> If you guys decide to remove hid-thingm.c, you need to update the
>> MAINTAINERS entry, checkpatch.pl should have warned about that.
>>
> Right, thanks for the hint.
>
>> I can hardly test the patchset now. Heiner, can you confirm me that with
>> your patchset, we will still see 3 led_classdev in sysfs for the
>> blink(1) mk1 (which has one RGB chip) and 6 for mk2 (which has 2 chips)?
>>
> Yes, this will still be the case.
Looks good to me then! Please Cc' me in the v2 so I can hack the change.
Thanks,
Vivien
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-06-22 20:04 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-06-21 19:50 [PATCH 4/4] HID: remove ThingM blink(1) driver Heiner Kallweit
2016-06-22 13:25 ` Jiri Kosina
2016-06-22 15:42 ` Vivien Didelot
2016-06-22 19:54 ` Heiner Kallweit
2016-06-22 20:03 ` Vivien Didelot
2016-06-22 19:52 ` Heiner Kallweit
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.