aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/ABI/testing/sysfs-driver-hid-roccat-kone7
-rw-r--r--drivers/hid/hid-roccat-kone.c12
-rw-r--r--drivers/hid/hid-roccat-kone.h2
3 files changed, 10 insertions, 11 deletions
diff --git a/Documentation/ABI/testing/sysfs-driver-hid-roccat-kone b/Documentation/ABI/testing/sysfs-driver-hid-roccat-kone
index 88340a23ce91..36bfa234f1e2 100644
--- a/Documentation/ABI/testing/sysfs-driver-hid-roccat-kone
+++ b/Documentation/ABI/testing/sysfs-driver-hid-roccat-kone
@@ -33,11 +33,10 @@ Description: When read, this file returns the raw integer version number of the
33 left. E.g. a returned value of 138 means 1.38 33 left. E.g. a returned value of 138 means 1.38
34 This file is readonly. 34 This file is readonly.
35 35
36What: /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/kone_driver_version 36What: /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/kone_abi_version
37Date: March 2010 37Date: May 2010
38Contact: Stefan Achatz <erazor_de@users.sourceforge.net> 38Contact: Stefan Achatz <erazor_de@users.sourceforge.net>
39Description: When read, this file returns the driver version. 39Description: When read, this file returns the abi version as an integer value.
40 The format of the string is "v<major>.<minor>.<patchlevel>".
41 This attribute is used by the userland tools to find the sysfs- 40 This attribute is used by the userland tools to find the sysfs-
42 paths of installed kone-mice and determine the capabilites of 41 paths of installed kone-mice and determine the capabilites of
43 the driver. Versions of this driver for old kernels replace 42 the driver. Versions of this driver for old kernels replace
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 */
626static ssize_t kone_sysfs_show_driver_version(struct device *dev, 626static 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
669static DEVICE_ATTR(kone_driver_version, 0440, 669static DEVICE_ATTR(kone_abi_version, 0440,
670 kone_sysfs_show_driver_version, NULL); 670 kone_sysfs_show_abi_version, NULL);
671 671
672static struct attribute *kone_attributes[] = { 672static 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)