summaryrefslogtreecommitdiffstats
path: root/drivers/hid/hid-thingm.c
diff options
context:
space:
mode:
authorVivien Didelot <vivien.didelot@savoirfairelinux.com>2014-04-14 16:50:18 -0400
committerJiri Kosina <jkosina@suse.cz>2014-04-15 14:42:51 +0200
commitaee114fd3c94f1be0f95af84d6ed25cd47702c41 (patch)
tree21ebe80fcc58e98aefc28ed34268136c12f8fa22 /drivers/hid/hid-thingm.c
parent21200ad10aba00943f9aa832fab04b8926dc7a52 (diff)
downloadlinux-stable-aee114fd3c94f1be0f95af84d6ed25cd47702c41.tar.gz
linux-stable-aee114fd3c94f1be0f95af84d6ed25cd47702c41.tar.bz2
linux-stable-aee114fd3c94f1be0f95af84d6ed25cd47702c41.zip
HID: thingm: remove the "fade" sysfs attribute
As for the "play" sysfs attribute, remove this other non-standard attribute, so the driver only implements what is required to switch the LED on and off. Thus, a fade time won't be ideal for some fast-changing triggers. Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/hid-thingm.c')
-rw-r--r--drivers/hid/hid-thingm.c41
1 files changed, 0 insertions, 41 deletions
diff --git a/drivers/hid/hid-thingm.c b/drivers/hid/hid-thingm.c
index 7e376b855632..e3b6647e00ce 100644
--- a/drivers/hid/hid-thingm.c
+++ b/drivers/hid/hid-thingm.c
@@ -26,14 +26,12 @@
* @hdev: HID device.
* @led_cdev: LED class instance.
* @rgb: 8-bit per channel RGB notation.
- * @fade: fade time in hundredths of a second.
* @brightness: brightness coefficient.
*/
struct blink1_data {
struct hid_device *hdev;
struct led_classdev led_cdev;
u32 rgb;
- u16 fade;
u8 brightness;
};
@@ -64,12 +62,6 @@ static int blink1_update_color(struct blink1_data *data)
buf[4] = DIV_ROUND_CLOSEST(blink1_rgb_to_b(data->rgb), coef);
}
- if (data->fade) {
- buf[1] = 'c';
- buf[5] = (data->fade & 0xFF00) >> 8;
- buf[6] = (data->fade & 0x00FF);
- }
-
return blink1_send_command(data, buf);
}
@@ -121,42 +113,9 @@ static ssize_t blink1_store_rgb(struct device *dev,
static DEVICE_ATTR(rgb, S_IRUGO | S_IWUSR, blink1_show_rgb, blink1_store_rgb);
-static ssize_t blink1_show_fade(struct device *dev,
- struct device_attribute *attr, char *buf)
-{
- struct blink1_data *data = dev_get_drvdata(dev->parent);
-
- return sprintf(buf, "%d\n", data->fade * 10);
-}
-
-static ssize_t blink1_store_fade(struct device *dev,
- struct device_attribute *attr, const char *buf, size_t count)
-{
- struct blink1_data *data = dev_get_drvdata(dev->parent);
- long unsigned int fade;
- int ret;
-
- ret = kstrtoul(buf, 10, &fade);
- if (ret)
- return ret;
-
- /* blink(1) accepts 16-bit fade time, number of 10ms ticks */
- fade = DIV_ROUND_CLOSEST(fade, 10);
- if (fade > 65535)
- return -EINVAL;
-
- data->fade = fade;
-
- return count;
-}
-
-static DEVICE_ATTR(fade, S_IRUGO | S_IWUSR,
- blink1_show_fade, blink1_store_fade);
-
static const struct attribute_group blink1_sysfs_group = {
.attrs = (struct attribute *[]) {
&dev_attr_rgb.attr,
- &dev_attr_fade.attr,
NULL
},
};