diff options
author | Stefan Achatz <erazor_de@users.sourceforge.net> | 2010-05-26 14:52:43 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2010-05-31 07:53:21 -0400 |
commit | 33ccbc320fc38094128c68b2ee0b305884965bd4 (patch) | |
tree | fcae4fd609d140af69f246eac1f3b1a26a6b4930 /drivers/hid | |
parent | 22d515723ff1d92eea4d7537a3f8d7674080422b (diff) |
HID: roccat: change kone_driver_version to kone_abi_version
Renamed the sysfs attribute kone_driver_version to kone_abi_version and
simplified returned data to integer.
Signed-off-by: Stefan Achatz <erazor_de@users.sourceforge.net>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid')
-rw-r--r-- | drivers/hid/hid-roccat-kone.c | 12 | ||||
-rw-r--r-- | drivers/hid/hid-roccat-kone.h | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/drivers/hid/hid-roccat-kone.c b/drivers/hid/hid-roccat-kone.c index 3e5b5534f2ed..0ab1df9d68ab 100644 --- a/drivers/hid/hid-roccat-kone.c +++ b/drivers/hid/hid-roccat-kone.c | |||
@@ -621,12 +621,12 @@ static ssize_t kone_sysfs_set_startup_profile(struct device *dev, | |||
621 | * This file is used by userland software to find devices that are handled by | 621 | * This file is used by userland software to find devices that are handled by |
622 | * this driver. This provides a consistent way for actual and older kernels | 622 | * this driver. This provides a consistent way for actual and older kernels |
623 | * where this driver replaced usbhid instead of generic-usb. | 623 | * where this driver replaced usbhid instead of generic-usb. |
624 | * Driver capabilities are determined by version number. | 624 | * Driver capabilities are determined by returned number. |
625 | */ | 625 | */ |
626 | static ssize_t kone_sysfs_show_driver_version(struct device *dev, | 626 | static ssize_t kone_sysfs_show_abi_version(struct device *dev, |
627 | struct device_attribute *attr, char *buf) | 627 | struct device_attribute *attr, char *buf) |
628 | { | 628 | { |
629 | return snprintf(buf, PAGE_SIZE, ROCCAT_KONE_DRIVER_VERSION "\n"); | 629 | return snprintf(buf, PAGE_SIZE, ROCCAT_KONE_ABI_VERSION "\n"); |
630 | } | 630 | } |
631 | 631 | ||
632 | /* | 632 | /* |
@@ -666,8 +666,8 @@ static DEVICE_ATTR(startup_profile, 0660, | |||
666 | kone_sysfs_show_startup_profile, | 666 | kone_sysfs_show_startup_profile, |
667 | kone_sysfs_set_startup_profile); | 667 | kone_sysfs_set_startup_profile); |
668 | 668 | ||
669 | static DEVICE_ATTR(kone_driver_version, 0440, | 669 | static DEVICE_ATTR(kone_abi_version, 0440, |
670 | kone_sysfs_show_driver_version, NULL); | 670 | kone_sysfs_show_abi_version, NULL); |
671 | 671 | ||
672 | static struct attribute *kone_attributes[] = { | 672 | static struct attribute *kone_attributes[] = { |
673 | &dev_attr_actual_dpi.attr, | 673 | &dev_attr_actual_dpi.attr, |
@@ -676,7 +676,7 @@ static struct attribute *kone_attributes[] = { | |||
676 | &dev_attr_firmware_version.attr, | 676 | &dev_attr_firmware_version.attr, |
677 | &dev_attr_tcu.attr, | 677 | &dev_attr_tcu.attr, |
678 | &dev_attr_startup_profile.attr, | 678 | &dev_attr_startup_profile.attr, |
679 | &dev_attr_kone_driver_version.attr, | 679 | &dev_attr_kone_abi_version.attr, |
680 | NULL | 680 | NULL |
681 | }; | 681 | }; |
682 | 682 | ||
diff --git a/drivers/hid/hid-roccat-kone.h b/drivers/hid/hid-roccat-kone.h index 003e6f81c195..71b14fa40dce 100644 --- a/drivers/hid/hid-roccat-kone.h +++ b/drivers/hid/hid-roccat-kone.h | |||
@@ -14,7 +14,7 @@ | |||
14 | 14 | ||
15 | #include <linux/types.h> | 15 | #include <linux/types.h> |
16 | 16 | ||
17 | #define ROCCAT_KONE_DRIVER_VERSION "v0.3.1" | 17 | #define ROCCAT_KONE_ABI_VERSION "1" |
18 | 18 | ||
19 | #pragma pack(push) | 19 | #pragma pack(push) |
20 | #pragma pack(1) | 20 | #pragma pack(1) |