| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <1362915180.2769.168.camel@neuromancer.tessier-ashpool>
Date: Sun, 10 Mar 2013 12:33:00 +0100
From: Stefan Achatz <erazor_de@...rs.sourceforge.net>
To: Rob Landley <rob@...dley.net>, Jiri Kosina <jkosina@...e.cz>,
linux-kernel@...r.kernel.org, linux-doc@...r.kernel.org,
linux-input@...r.kernel.org
Subject: [PATCH 3/5] HID: roccat: Removed profile change reports for
outside changes
Userland-tools don't need to be notified about changes they issued themselves
anymore.
Signed-off-by: Stefan Achatz <erazor_de@...rs.sourceforge.net>
---
drivers/hid/hid-roccat-isku.c | 6 ------
drivers/hid/hid-roccat-kone.c | 16 +---------------
drivers/hid/hid-roccat-koneplus.c | 7 -------
drivers/hid/hid-roccat-kovaplus.c | 8 --------
drivers/hid/hid-roccat-pyra.c | 7 -------
5 files changed, 1 insertions(+), 43 deletions(-)
diff --git a/drivers/hid/hid-roccat-isku.c b/drivers/hid/hid-roccat-isku.c
index b43c792..8ac83bb 100644
--- a/drivers/hid/hid-roccat-isku.c
+++ b/drivers/hid/hid-roccat-isku.c
@@ -77,7 +77,6 @@ static ssize_t isku_sysfs_set_actual_profile(struct device *dev,
struct usb_device *usb_dev;
unsigned long profile;
int retval;
- struct isku_roccat_report roccat_report;
dev = dev->parent->parent;
isku = hid_get_drvdata(dev_get_drvdata(dev));
@@ -98,11 +97,6 @@ static ssize_t isku_sysfs_set_actual_profile(struct device *dev,
return retval;
}
- roccat_report.event = ISKU_REPORT_BUTTON_EVENT_PROFILE;
- roccat_report.data1 = profile + 1;
- roccat_report.data2 = 0;
- roccat_report_event(isku->chrdev_minor, (uint8_t const *)&roccat_report);
-
mutex_unlock(&isku->isku_lock);
return size;
diff --git a/drivers/hid/hid-roccat-kone.c b/drivers/hid/hid-roccat-kone.c
index 9ce2d0b..49132f8 100644
--- a/drivers/hid/hid-roccat-kone.c
+++ b/drivers/hid/hid-roccat-kone.c
@@ -43,15 +43,6 @@ static void kone_profile_activated(struct kone_device *kone, uint new_profile)
kone->actual_dpi = kone->profiles[new_profile - 1].startup_dpi;
}
-static void kone_profile_report(struct kone_device *kone, uint new_profile)
-{
- struct kone_roccat_report roccat_report;
- roccat_report.event = kone_mouse_event_switch_profile;
- roccat_report.value = new_profile;
- roccat_report.key = 0;
- roccat_report_event(kone->chrdev_minor, (uint8_t *)&roccat_report);
-}
-
static int kone_receive(struct usb_device *usb_dev, uint usb_command,
void *data, uint size)
{
@@ -296,7 +287,7 @@ static ssize_t kone_sysfs_write_settings(struct file *fp, struct kobject *kobj,
container_of(kobj, struct device, kobj)->parent->parent;
struct kone_device *kone = hid_get_drvdata(dev_get_drvdata(dev));
struct usb_device *usb_dev = interface_to_usbdev(to_usb_interface(dev));
- int retval = 0, difference, old_profile;
+ int retval = 0, difference;
/* I need to get my data in one piece */
if (off != 0 || count != sizeof(struct kone_settings))
@@ -312,13 +303,9 @@ static ssize_t kone_sysfs_write_settings(struct file *fp, struct kobject *kobj,
return retval;
}
- old_profile = kone->settings.startup_profile;
memcpy(&kone->settings, buf, sizeof(struct kone_settings));
kone_profile_activated(kone, kone->settings.startup_profile);
-
- if (kone->settings.startup_profile != old_profile)
- kone_profile_report(kone, kone->settings.startup_profile);
}
mutex_unlock(&kone->kone_lock);
@@ -565,7 +552,6 @@ static ssize_t kone_sysfs_set_startup_profile(struct device *dev,
/* changing the startup profile immediately activates this profile */
kone_profile_activated(kone, new_startup_profile);
- kone_profile_report(kone, new_startup_profile);
mutex_unlock(&kone->kone_lock);
return size;
diff --git a/drivers/hid/hid-roccat-koneplus.c b/drivers/hid/hid-roccat-koneplus.c
index 1c9ed19..ddedcba 100644
--- a/drivers/hid/hid-roccat-koneplus.c
+++ b/drivers/hid/hid-roccat-koneplus.c
@@ -240,7 +240,6 @@ static ssize_t koneplus_sysfs_set_actual_profile(struct device *dev,
struct usb_device *usb_dev;
unsigned long profile;
int retval;
- struct koneplus_roccat_report roccat_report;
dev = dev->parent->parent;
koneplus = hid_get_drvdata(dev_get_drvdata(dev));
@@ -261,12 +260,6 @@ static ssize_t koneplus_sysfs_set_actual_profile(struct device *dev,
return retval;
}
- roccat_report.type = KONEPLUS_MOUSE_REPORT_BUTTON_TYPE_PROFILE;
- roccat_report.data1 = profile + 1;
- roccat_report.data2 = 0;
- roccat_report_event(koneplus->chrdev_minor,
- (uint8_t const *)&roccat_report);
-
mutex_unlock(&koneplus->koneplus_lock);
return size;
diff --git a/drivers/hid/hid-roccat-kovaplus.c b/drivers/hid/hid-roccat-kovaplus.c
index eac248d..4644b6e 100644
--- a/drivers/hid/hid-roccat-kovaplus.c
+++ b/drivers/hid/hid-roccat-kovaplus.c
@@ -281,7 +281,6 @@ static ssize_t kovaplus_sysfs_set_actual_profile(struct device *dev,
struct usb_device *usb_dev;
unsigned long profile;
int retval;
- struct kovaplus_roccat_report roccat_report;
dev = dev->parent->parent;
kovaplus = hid_get_drvdata(dev_get_drvdata(dev));
@@ -303,13 +302,6 @@ static ssize_t kovaplus_sysfs_set_actual_profile(struct device *dev,
kovaplus_profile_activated(kovaplus, profile);
- roccat_report.type = KOVAPLUS_MOUSE_REPORT_BUTTON_TYPE_PROFILE_1;
- roccat_report.button = 0;
- roccat_report.data1 = profile + 1;
- roccat_report.data2 = 0;
- roccat_report_event(kovaplus->chrdev_minor,
- (uint8_t const *)&roccat_report);
-
mutex_unlock(&kovaplus->kovaplus_lock);
return size;
diff --git a/drivers/hid/hid-roccat-pyra.c b/drivers/hid/hid-roccat-pyra.c
index d4f1e3b..337329e4 100644
--- a/drivers/hid/hid-roccat-pyra.c
+++ b/drivers/hid/hid-roccat-pyra.c
@@ -230,7 +230,6 @@ static ssize_t pyra_sysfs_write_settings(struct file *fp,
struct pyra_device *pyra = hid_get_drvdata(dev_get_drvdata(dev));
struct usb_device *usb_dev = interface_to_usbdev(to_usb_interface(dev));
int retval = 0;
- struct pyra_roccat_report roccat_report;
struct pyra_settings const *settings;
if (off != 0 || count != PYRA_SIZE_SETTINGS)
@@ -248,12 +247,6 @@ static ssize_t pyra_sysfs_write_settings(struct file *fp,
profile_activated(pyra, settings->startup_profile);
- roccat_report.type = PYRA_MOUSE_EVENT_BUTTON_TYPE_PROFILE_2;
- roccat_report.value = settings->startup_profile + 1;
- roccat_report.key = 0;
- roccat_report_event(pyra->chrdev_minor,
- (uint8_t const *)&roccat_report);
-
mutex_unlock(&pyra->pyra_lock);
return PYRA_SIZE_SETTINGS;
}
--
1.7.3.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists