aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Achatz <erazor_de@users.sourceforge.net>2010-06-18 10:42:25 -0400
committerJiri Kosina <jkosina@suse.cz>2010-06-21 09:20:35 -0400
commit0b3fa399bef02f3658295f8dd334fc26a59c3a95 (patch)
tree2784c41a153f5eb952716436b5dfd850587f456e
parentcab6b16aca4ac12f731a523fe14770add2f9394a (diff)
HID: roccat: remove obsolete kone_abi_version sysfs attribute
The newest version of the accompanying userland tools cuts backward compatibility and uses libudev to find its devices superseding the quirky kone_abi_version sysfs attribute. Therefore it should be removed. Signed-off-by: Stefan Achatz <erazor_de@users.sourceforge.net> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r--Documentation/ABI/testing/sysfs-driver-hid-roccat-kone12
-rw-r--r--drivers/hid/hid-roccat-kone.c16
-rw-r--r--drivers/hid/hid-roccat-kone.h2
3 files changed, 0 insertions, 30 deletions
diff --git a/Documentation/ABI/testing/sysfs-driver-hid-roccat-kone b/Documentation/ABI/testing/sysfs-driver-hid-roccat-kone
index 36bfa234f1e2..063bda7fe707 100644
--- a/Documentation/ABI/testing/sysfs-driver-hid-roccat-kone
+++ b/Documentation/ABI/testing/sysfs-driver-hid-roccat-kone
@@ -33,18 +33,6 @@ 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_abi_version
37Date: May 2010
38Contact: Stefan Achatz <erazor_de@users.sourceforge.net>
39Description: When read, this file returns the abi version as an integer value.
40 This attribute is used by the userland tools to find the sysfs-
41 paths of installed kone-mice and determine the capabilites of
42 the driver. Versions of this driver for old kernels replace
43 usbhid instead of generic-usb. The way to scan for this file
44 has been chosen to provide a consistent way for all supported
45 kernel versions.
46 This file is readonly.
47
48What: /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/profile[1-5] 36What: /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/profile[1-5]
49Date: March 2010 37Date: March 2010
50Contact: Stefan Achatz <erazor_de@users.sourceforge.net> 38Contact: Stefan Achatz <erazor_de@users.sourceforge.net>
diff --git a/drivers/hid/hid-roccat-kone.c b/drivers/hid/hid-roccat-kone.c
index 2aef6e4caf43..f77695762cb5 100644
--- a/drivers/hid/hid-roccat-kone.c
+++ b/drivers/hid/hid-roccat-kone.c
@@ -618,18 +618,6 @@ static ssize_t kone_sysfs_set_startup_profile(struct device *dev,
618} 618}
619 619
620/* 620/*
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
623 * where this driver replaced usbhid instead of generic-usb.
624 * Driver capabilities are determined by returned number.
625 */
626static ssize_t kone_sysfs_show_abi_version(struct device *dev,
627 struct device_attribute *attr, char *buf)
628{
629 return snprintf(buf, PAGE_SIZE, ROCCAT_KONE_ABI_VERSION "\n");
630}
631
632/*
633 * Read actual dpi settings. 621 * Read actual dpi settings.
634 * Returns raw value for further processing. Refer to enum kone_polling_rates to 622 * Returns raw value for further processing. Refer to enum kone_polling_rates to
635 * get real value. 623 * get real value.
@@ -666,9 +654,6 @@ static DEVICE_ATTR(startup_profile, 0660,
666 kone_sysfs_show_startup_profile, 654 kone_sysfs_show_startup_profile,
667 kone_sysfs_set_startup_profile); 655 kone_sysfs_set_startup_profile);
668 656
669static DEVICE_ATTR(kone_abi_version, 0440,
670 kone_sysfs_show_abi_version, NULL);
671
672static struct attribute *kone_attributes[] = { 657static struct attribute *kone_attributes[] = {
673 &dev_attr_actual_dpi.attr, 658 &dev_attr_actual_dpi.attr,
674 &dev_attr_actual_profile.attr, 659 &dev_attr_actual_profile.attr,
@@ -676,7 +661,6 @@ static struct attribute *kone_attributes[] = {
676 &dev_attr_firmware_version.attr, 661 &dev_attr_firmware_version.attr,
677 &dev_attr_tcu.attr, 662 &dev_attr_tcu.attr,
678 &dev_attr_startup_profile.attr, 663 &dev_attr_startup_profile.attr,
679 &dev_attr_kone_abi_version.attr,
680 NULL 664 NULL
681}; 665};
682 666
diff --git a/drivers/hid/hid-roccat-kone.h b/drivers/hid/hid-roccat-kone.h
index 71b14fa40dce..130d6566ea82 100644
--- a/drivers/hid/hid-roccat-kone.h
+++ b/drivers/hid/hid-roccat-kone.h
@@ -14,8 +14,6 @@
14 14
15#include <linux/types.h> 15#include <linux/types.h>
16 16
17#define ROCCAT_KONE_ABI_VERSION "1"
18
19#pragma pack(push) 17#pragma pack(push)
20#pragma pack(1) 18#pragma pack(1)
21 19