HID: thingm: remove the "play" sysfs attribute

When the thingm driver registers an instance of LED class, it creates a
"play" sysfs attribute for this blink(1) specific feature.

Since this feature is not specific to the RGB chip but to the HID device
itself, let's remove this attribute from the LED instance and only
implement what is useful to switch on and off the LED.

This feature is still easily accessible through hidraw.

Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

diff --git a/Documentation/ABI/testing/sysfs-driver-hid-thingm b/Documentation/ABI/testing/sysfs-driver-hid-thingm
index abcffeedd20a3653fb083bd4d2b257b992e0f6c3..fda6185b92924ee1e9bb3ccd61a5a6a6ecc3b81f 100644 (file)
--- a/Documentation/ABI/testing/sysfs-driver-hid-thingm
+++ b/Documentation/ABI/testing/sysfs-driver-hid-thingm
@@ -14,10 +14,3 @@ Description: This attribute allows to set a fade time in milliseconds for
                the next color change. Read the attribute to know the current
                fade time. The default value is set to 0 (no fade time). For
                instance, set a fade time of 2 seconds with: echo 2000 > fade
-
-What:          /sys/class/leds/blink1::<serial>/play
-Date:          January 2013
-Contact:       Vivien Didelot <vivien.didelot@savoirfairelinux.com>
-Description:   This attribute is used to play/pause the light patterns. Write 1
-               to start playing, 0 to stop. Reading this attribute returns the
-               current playing status.

diff --git a/drivers/hid/hid-thingm.c b/drivers/hid/hid-thingm.c
index a97c78845f7b19ef6222a5152a812bd23b56951a..7e376b8556329a005b333e6f570cc0eae67c7e0c 100644 (file)
--- a/drivers/hid/hid-thingm.c
+++ b/drivers/hid/hid-thingm.c
@@ -28,7 +28,6 @@
  * @rgb:               8-bit per channel RGB notation.
  * @fade:              fade time in hundredths of a second.
  * @brightness:                brightness coefficient.
- * @play:              play/pause in-memory patterns.
  */
 struct blink1_data {
        struct hid_device *hdev;
@@ -36,7 +35,6 @@ struct blink1_data {
        u32 rgb;
        u16 fade;
        u8 brightness;
-       bool play;
 };
 
 static int blink1_send_command(struct blink1_data *data,
@@ -155,41 +153,10 @@ static ssize_t blink1_store_fade(struct device *dev,
 static DEVICE_ATTR(fade, S_IRUGO | S_IWUSR,
                blink1_show_fade, blink1_store_fade);
 
-static ssize_t blink1_show_play(struct device *dev,
-               struct device_attribute *attr, char *buf)
-{
-       struct blink1_data *data = dev_get_drvdata(dev->parent);
-
-       return sprintf(buf, "%d\n", data->play);
-}
-
-static ssize_t blink1_store_play(struct device *dev,
-               struct device_attribute *attr, const char *buf, size_t count)
-{
-       struct blink1_data *data = dev_get_drvdata(dev->parent);
-       u8 cmd[BLINK1_CMD_SIZE] = { 1, 'p', 0, 0, 0, 0, 0, 0, 0 };
-       long unsigned int play;
-       int ret;
-
-       ret = kstrtoul(buf, 10, &play);
-       if (ret)
-               return ret;
-
-       data->play = !!play;
-       cmd[2] = data->play;
-       ret = blink1_send_command(data, cmd);
-
-       return ret ? ret : count;
-}
-
-static DEVICE_ATTR(play, S_IRUGO | S_IWUSR,
-               blink1_show_play, blink1_store_play);
-
 static const struct attribute_group blink1_sysfs_group = {
        .attrs = (struct attribute *[]) {
                &dev_attr_rgb.attr,
                &dev_attr_fade.attr,
-               &dev_attr_play.attr,
                NULL
        },
 };