diff options
| -rw-r--r-- | drivers/hid/hid-lg4ff.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/hid/hid-lg4ff.c b/drivers/hid/hid-lg4ff.c index 4b668bf6a67c..db0dd9b17e53 100644 --- a/drivers/hid/hid-lg4ff.c +++ b/drivers/hid/hid-lg4ff.c | |||
| @@ -49,11 +49,6 @@ | |||
| 49 | 49 | ||
| 50 | static void hid_lg4ff_set_range_dfp(struct hid_device *hid, u16 range); | 50 | static void hid_lg4ff_set_range_dfp(struct hid_device *hid, u16 range); |
| 51 | static void hid_lg4ff_set_range_g25(struct hid_device *hid, u16 range); | 51 | static void hid_lg4ff_set_range_g25(struct hid_device *hid, u16 range); |
| 52 | static ssize_t lg4ff_range_show(struct device *dev, struct device_attribute *attr, char *buf); | ||
| 53 | static ssize_t lg4ff_range_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count); | ||
| 54 | |||
| 55 | static DEVICE_ATTR(range, S_IRUGO | S_IWUSR, lg4ff_range_show, | ||
| 56 | lg4ff_range_store); | ||
| 57 | 52 | ||
| 58 | struct lg4ff_device_entry { | 53 | struct lg4ff_device_entry { |
| 59 | __u32 product_id; | 54 | __u32 product_id; |
| @@ -417,7 +412,8 @@ static void hid_lg4ff_switch_native(struct hid_device *hid, const struct lg4ff_n | |||
| 417 | } | 412 | } |
| 418 | 413 | ||
| 419 | /* Read current range and display it in terminal */ | 414 | /* Read current range and display it in terminal */ |
| 420 | static ssize_t lg4ff_range_show(struct device *dev, struct device_attribute *attr, char *buf) | 415 | static ssize_t range_show(struct device *dev, struct device_attribute *attr, |
| 416 | char *buf) | ||
| 421 | { | 417 | { |
| 422 | struct hid_device *hid = to_hid_device(dev); | 418 | struct hid_device *hid = to_hid_device(dev); |
| 423 | struct lg4ff_device_entry *entry; | 419 | struct lg4ff_device_entry *entry; |
| @@ -442,7 +438,8 @@ static ssize_t lg4ff_range_show(struct device *dev, struct device_attribute *att | |||
| 442 | 438 | ||
| 443 | /* Set range to user specified value, call appropriate function | 439 | /* Set range to user specified value, call appropriate function |
| 444 | * according to the type of the wheel */ | 440 | * according to the type of the wheel */ |
| 445 | static ssize_t lg4ff_range_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) | 441 | static ssize_t range_store(struct device *dev, struct device_attribute *attr, |
| 442 | const char *buf, size_t count) | ||
| 446 | { | 443 | { |
| 447 | struct hid_device *hid = to_hid_device(dev); | 444 | struct hid_device *hid = to_hid_device(dev); |
| 448 | struct lg4ff_device_entry *entry; | 445 | struct lg4ff_device_entry *entry; |
| @@ -473,6 +470,7 @@ static ssize_t lg4ff_range_store(struct device *dev, struct device_attribute *at | |||
| 473 | 470 | ||
| 474 | return count; | 471 | return count; |
| 475 | } | 472 | } |
| 473 | static DEVICE_ATTR_RW(range); | ||
| 476 | 474 | ||
| 477 | #ifdef CONFIG_LEDS_CLASS | 475 | #ifdef CONFIG_LEDS_CLASS |
| 478 | static void lg4ff_set_leds(struct hid_device *hid, __u8 leds) | 476 | static void lg4ff_set_leds(struct hid_device *hid, __u8 leds) |
