Skip to content

Commit

Permalink
HID: roccat: change kone_driver_version to kone_abi_version
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Stefan Achatz authored and Jiri Kosina committed May 31, 2010
1 parent 22d5157 commit 33ccbc3
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 11 deletions.
7 changes: 3 additions & 4 deletions Documentation/ABI/testing/sysfs-driver-hid-roccat-kone
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,10 @@ Description: When read, this file returns the raw integer version number of the
left. E.g. a returned value of 138 means 1.38
This file is readonly.

What: /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/kone_driver_version
Date: March 2010
What: /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/kone_abi_version
Date: May 2010
Contact: Stefan Achatz <erazor_de@users.sourceforge.net>
Description: When read, this file returns the driver version.
The format of the string is "v<major>.<minor>.<patchlevel>".
Description: When read, this file returns the abi version as an integer value.
This attribute is used by the userland tools to find the sysfs-
paths of installed kone-mice and determine the capabilites of
the driver. Versions of this driver for old kernels replace
Expand Down
12 changes: 6 additions & 6 deletions drivers/hid/hid-roccat-kone.c
Original file line number Diff line number Diff line change
Expand Up @@ -621,12 +621,12 @@ static ssize_t kone_sysfs_set_startup_profile(struct device *dev,
* This file is used by userland software to find devices that are handled by
* this driver. This provides a consistent way for actual and older kernels
* where this driver replaced usbhid instead of generic-usb.
* Driver capabilities are determined by version number.
* Driver capabilities are determined by returned number.
*/
static ssize_t kone_sysfs_show_driver_version(struct device *dev,
static ssize_t kone_sysfs_show_abi_version(struct device *dev,
struct device_attribute *attr, char *buf)
{
return snprintf(buf, PAGE_SIZE, ROCCAT_KONE_DRIVER_VERSION "\n");
return snprintf(buf, PAGE_SIZE, ROCCAT_KONE_ABI_VERSION "\n");
}

/*
Expand Down Expand Up @@ -666,8 +666,8 @@ static DEVICE_ATTR(startup_profile, 0660,
kone_sysfs_show_startup_profile,
kone_sysfs_set_startup_profile);

static DEVICE_ATTR(kone_driver_version, 0440,
kone_sysfs_show_driver_version, NULL);
static DEVICE_ATTR(kone_abi_version, 0440,
kone_sysfs_show_abi_version, NULL);

static struct attribute *kone_attributes[] = {
&dev_attr_actual_dpi.attr,
Expand All @@ -676,7 +676,7 @@ static struct attribute *kone_attributes[] = {
&dev_attr_firmware_version.attr,
&dev_attr_tcu.attr,
&dev_attr_startup_profile.attr,
&dev_attr_kone_driver_version.attr,
&dev_attr_kone_abi_version.attr,
NULL
};

Expand Down
2 changes: 1 addition & 1 deletion drivers/hid/hid-roccat-kone.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

#include <linux/types.h>

#define ROCCAT_KONE_DRIVER_VERSION "v0.3.1"
#define ROCCAT_KONE_ABI_VERSION "1"

#pragma pack(push)
#pragma pack(1)
Expand Down

0 comments on commit 33ccbc3

Please sign in to comment.