HID: roccat: reduce number of functions in kone and pyra drivers

The profile number is now passed via bin_attribute->private instead
of function parameter to reduce number of functions.

Signed-off-by: Stefan Achatz <erazor_de@users.sourceforge.net>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

diff --git a/drivers/hid/hid-roccat-kone.c b/drivers/hid/hid-roccat-kone.c
index 648d28e5f3f03234791fa8ee7a7a39d6cb60b177..cbd8cc42e75ab38d203697f1752cbeabd09ad2c7 100644 (file)
--- a/drivers/hid/hid-roccat-kone.c
+++ b/drivers/hid/hid-roccat-kone.c
@@ -35,6 +35,8 @@
 #include "hid-roccat.h"
 #include "hid-roccat-kone.h"
 
+static uint profile_numbers[5] = {0, 1, 2, 3, 4};
+
 /* kone_class is used for creating sysfs attributes via roccat char device */
 static struct class *kone_class;
 
@@ -323,9 +325,9 @@ static ssize_t kone_sysfs_write_settings(struct file *fp, struct kobject *kobj,
        return sizeof(struct kone_settings);
 }
 
-static ssize_t kone_sysfs_read_profilex(struct kobject *kobj,
-               struct bin_attribute *attr, char *buf,
-               loff_t off, size_t count, int number) {
+static ssize_t kone_sysfs_read_profilex(struct file *fp,
+               struct kobject *kobj, struct bin_attribute *attr,
+               char *buf, loff_t off, size_t count) {
        struct device *dev =
                        container_of(kobj, struct device, kobj)->parent->parent;
        struct kone_device *kone = hid_get_drvdata(dev_get_drvdata(dev));
@@ -337,46 +339,16 @@ static ssize_t kone_sysfs_read_profilex(struct kobject *kobj,
                count = sizeof(struct kone_profile) - off;
 
        mutex_lock(&kone->kone_lock);
-       memcpy(buf, ((char const *)&kone->profiles[number - 1]) + off, count);
+       memcpy(buf, ((char const *)&kone->profiles[*(uint *)(attr->private)]) + off, count);
        mutex_unlock(&kone->kone_lock);
 
        return count;
 }
 
-static ssize_t kone_sysfs_read_profile1(struct file *fp, struct kobject *kobj,
-               struct bin_attribute *attr, char *buf,
-               loff_t off, size_t count) {
-       return kone_sysfs_read_profilex(kobj, attr, buf, off, count, 1);
-}
-
-static ssize_t kone_sysfs_read_profile2(struct file *fp, struct kobject *kobj,
-               struct bin_attribute *attr, char *buf,
-               loff_t off, size_t count) {
-       return kone_sysfs_read_profilex(kobj, attr, buf, off, count, 2);
-}
-
-static ssize_t kone_sysfs_read_profile3(struct file *fp, struct kobject *kobj,
-               struct bin_attribute *attr, char *buf,
-               loff_t off, size_t count) {
-       return kone_sysfs_read_profilex(kobj, attr, buf, off, count, 3);
-}
-
-static ssize_t kone_sysfs_read_profile4(struct file *fp, struct kobject *kobj,
-               struct bin_attribute *attr, char *buf,
-               loff_t off, size_t count) {
-       return kone_sysfs_read_profilex(kobj, attr, buf, off, count, 4);
-}
-
-static ssize_t kone_sysfs_read_profile5(struct file *fp, struct kobject *kobj,
-               struct bin_attribute *attr, char *buf,
-               loff_t off, size_t count) {
-       return kone_sysfs_read_profilex(kobj, attr, buf, off, count, 5);
-}
-
 /* Writes data only if different to stored data */
-static ssize_t kone_sysfs_write_profilex(struct kobject *kobj,
-               struct bin_attribute *attr, char *buf,
-               loff_t off, size_t count, int number) {
+static ssize_t kone_sysfs_write_profilex(struct file *fp,
+               struct kobject *kobj, struct bin_attribute *attr,
+               char *buf, loff_t off, size_t count) {
        struct device *dev =
                        container_of(kobj, struct device, kobj)->parent->parent;
        struct kone_device *kone = hid_get_drvdata(dev_get_drvdata(dev));
@@ -388,13 +360,14 @@ static ssize_t kone_sysfs_write_profilex(struct kobject *kobj,
        if (off != 0 || count != sizeof(struct kone_profile))
                return -EINVAL;
 
-       profile = &kone->profiles[number - 1];
+       profile = &kone->profiles[*(uint *)(attr->private)];
 
        mutex_lock(&kone->kone_lock);
        difference = memcmp(buf, profile, sizeof(struct kone_profile));
        if (difference) {
                retval = kone_set_profile(usb_dev,
-                               (struct kone_profile const *)buf, number);
+                               (struct kone_profile const *)buf,
+                               *(uint *)(attr->private) + 1);
                if (!retval)
                        memcpy(profile, buf, sizeof(struct kone_profile));
        }
@@ -406,36 +379,6 @@ static ssize_t kone_sysfs_write_profilex(struct kobject *kobj,
        return sizeof(struct kone_profile);
 }
 
-static ssize_t kone_sysfs_write_profile1(struct file *fp, struct kobject *kobj,
-               struct bin_attribute *attr, char *buf,
-               loff_t off, size_t count) {
-       return kone_sysfs_write_profilex(kobj, attr, buf, off, count, 1);
-}
-
-static ssize_t kone_sysfs_write_profile2(struct file *fp, struct kobject *kobj,
-               struct bin_attribute *attr, char *buf,
-               loff_t off, size_t count) {
-       return kone_sysfs_write_profilex(kobj, attr, buf, off, count, 2);
-}
-
-static ssize_t kone_sysfs_write_profile3(struct file *fp, struct kobject *kobj,
-               struct bin_attribute *attr, char *buf,
-               loff_t off, size_t count) {
-       return kone_sysfs_write_profilex(kobj, attr, buf, off, count, 3);
-}
-
-static ssize_t kone_sysfs_write_profile4(struct file *fp, struct kobject *kobj,
-               struct bin_attribute *attr, char *buf,
-               loff_t off, size_t count) {
-       return kone_sysfs_write_profilex(kobj, attr, buf, off, count, 4);
-}
-
-static ssize_t kone_sysfs_write_profile5(struct file *fp, struct kobject *kobj,
-               struct bin_attribute *attr, char *buf,
-               loff_t off, size_t count) {
-       return kone_sysfs_write_profilex(kobj, attr, buf, off, count, 5);
-}
-
 static ssize_t kone_sysfs_show_actual_profile(struct device *dev,
                struct device_attribute *attr, char *buf)
 {
@@ -691,32 +634,37 @@ static struct bin_attribute kone_bin_attributes[] = {
        {
                .attr = { .name = "profile1", .mode = 0660 },
                .size = sizeof(struct kone_profile),
-               .read = kone_sysfs_read_profile1,
-               .write = kone_sysfs_write_profile1
+               .read = kone_sysfs_read_profilex,
+               .write = kone_sysfs_write_profilex,
+               .private = &profile_numbers[0]
        },
        {
                .attr = { .name = "profile2", .mode = 0660 },
                .size = sizeof(struct kone_profile),
-               .read = kone_sysfs_read_profile2,
-               .write = kone_sysfs_write_profile2
+               .read = kone_sysfs_read_profilex,
+               .write = kone_sysfs_write_profilex,
+               .private = &profile_numbers[1]
        },
        {
                .attr = { .name = "profile3", .mode = 0660 },
                .size = sizeof(struct kone_profile),
-               .read = kone_sysfs_read_profile3,
-               .write = kone_sysfs_write_profile3
+               .read = kone_sysfs_read_profilex,
+               .write = kone_sysfs_write_profilex,
+               .private = &profile_numbers[2]
        },
        {
                .attr = { .name = "profile4", .mode = 0660 },
                .size = sizeof(struct kone_profile),
-               .read = kone_sysfs_read_profile4,
-               .write = kone_sysfs_write_profile4
+               .read = kone_sysfs_read_profilex,
+               .write = kone_sysfs_write_profilex,
+               .private = &profile_numbers[3]
        },
        {
                .attr = { .name = "profile5", .mode = 0660 },
                .size = sizeof(struct kone_profile),
-               .read = kone_sysfs_read_profile5,
-               .write = kone_sysfs_write_profile5
+               .read = kone_sysfs_read_profilex,
+               .write = kone_sysfs_write_profilex,
+               .private = &profile_numbers[4]
        },
        __ATTR_NULL
 };

diff --git a/drivers/hid/hid-roccat-pyra.c b/drivers/hid/hid-roccat-pyra.c
index 7273e1e9093d6ad396c01235896edb47f98f48b6..02c58e015bee953a03ed5a7b8f48666e53dcec39 100644 (file)
--- a/drivers/hid/hid-roccat-pyra.c
+++ b/drivers/hid/hid-roccat-pyra.c
@@ -27,6 +27,8 @@
 #include "hid-roccat.h"
 #include "hid-roccat-pyra.h"
 
+static uint profile_numbers[5] = {0, 1, 2, 3, 4};
+
 /* pyra_class is used for creating sysfs attributes via roccat char device */
 static struct class *pyra_class;
 
@@ -223,7 +225,7 @@ static int pyra_set_settings(struct usb_device *usb_dev,
 
 static ssize_t pyra_sysfs_read_profilex_settings(struct file *fp,
                struct kobject *kobj, struct bin_attribute *attr, char *buf,
-               loff_t off, size_t count, int number)
+               loff_t off, size_t count)
 {
        struct device *dev =
                        container_of(kobj, struct device, kobj)->parent->parent;
@@ -236,56 +238,16 @@ static ssize_t pyra_sysfs_read_profilex_settings(struct file *fp,
                count = sizeof(struct pyra_profile_settings) - off;
 
        mutex_lock(&pyra->pyra_lock);
-       memcpy(buf, ((char const *)&pyra->profile_settings[number]) + off,
+       memcpy(buf, ((char const *)&pyra->profile_settings[*(uint *)(attr->private)]) + off,
                        count);
        mutex_unlock(&pyra->pyra_lock);
 
        return count;
 }
 
-static ssize_t pyra_sysfs_read_profile1_settings(struct file *fp,
-               struct kobject *kobj, struct bin_attribute *attr, char *buf,
-               loff_t off, size_t count)
-{
-       return pyra_sysfs_read_profilex_settings(fp, kobj,
-                       attr, buf, off, count, 0);
-}
-
-static ssize_t pyra_sysfs_read_profile2_settings(struct file *fp,
-               struct kobject *kobj, struct bin_attribute *attr, char *buf,
-               loff_t off, size_t count)
-{
-       return pyra_sysfs_read_profilex_settings(fp, kobj,
-                       attr, buf, off, count, 1);
-}
-
-static ssize_t pyra_sysfs_read_profile3_settings(struct file *fp,
-               struct kobject *kobj, struct bin_attribute *attr, char *buf,
-               loff_t off, size_t count)
-{
-       return pyra_sysfs_read_profilex_settings(fp, kobj,
-                       attr, buf, off, count, 2);
-}
-
-static ssize_t pyra_sysfs_read_profile4_settings(struct file *fp,
-               struct kobject *kobj, struct bin_attribute *attr, char *buf,
-               loff_t off, size_t count)
-{
-       return pyra_sysfs_read_profilex_settings(fp, kobj,
-                       attr, buf, off, count, 3);
-}
-
-static ssize_t pyra_sysfs_read_profile5_settings(struct file *fp,
-               struct kobject *kobj, struct bin_attribute *attr, char *buf,
-               loff_t off, size_t count)
-{
-       return pyra_sysfs_read_profilex_settings(fp, kobj,
-                       attr, buf, off, count, 4);
-}
-
 static ssize_t pyra_sysfs_read_profilex_buttons(struct file *fp,
                struct kobject *kobj, struct bin_attribute *attr, char *buf,
-               loff_t off, size_t count, int number)
+               loff_t off, size_t count)
 {
        struct device *dev =
                        container_of(kobj, struct device, kobj)->parent->parent;
@@ -298,53 +260,13 @@ static ssize_t pyra_sysfs_read_profilex_buttons(struct file *fp,
                count = sizeof(struct pyra_profile_buttons) - off;
 
        mutex_lock(&pyra->pyra_lock);
-       memcpy(buf, ((char const *)&pyra->profile_buttons[number]) + off,
+       memcpy(buf, ((char const *)&pyra->profile_buttons[*(uint *)(attr->private)]) + off,
                        count);
        mutex_unlock(&pyra->pyra_lock);
 
        return count;
 }
 
-static ssize_t pyra_sysfs_read_profile1_buttons(struct file *fp,
-               struct kobject *kobj, struct bin_attribute *attr, char *buf,
-               loff_t off, size_t count)
-{
-       return pyra_sysfs_read_profilex_buttons(fp, kobj,
-                       attr, buf, off, count, 0);
-}
-
-static ssize_t pyra_sysfs_read_profile2_buttons(struct file *fp,
-               struct kobject *kobj, struct bin_attribute *attr, char *buf,
-               loff_t off, size_t count)
-{
-       return pyra_sysfs_read_profilex_buttons(fp, kobj,
-                       attr, buf, off, count, 1);
-}
-
-static ssize_t pyra_sysfs_read_profile3_buttons(struct file *fp,
-               struct kobject *kobj, struct bin_attribute *attr, char *buf,
-               loff_t off, size_t count)
-{
-       return pyra_sysfs_read_profilex_buttons(fp, kobj,
-                       attr, buf, off, count, 2);
-}
-
-static ssize_t pyra_sysfs_read_profile4_buttons(struct file *fp,
-               struct kobject *kobj, struct bin_attribute *attr, char *buf,
-               loff_t off, size_t count)
-{
-       return pyra_sysfs_read_profilex_buttons(fp, kobj,
-                       attr, buf, off, count, 3);
-}
-
-static ssize_t pyra_sysfs_read_profile5_buttons(struct file *fp,
-               struct kobject *kobj, struct bin_attribute *attr, char *buf,
-               loff_t off, size_t count)
-{
-       return pyra_sysfs_read_profilex_buttons(fp, kobj,
-                       attr, buf, off, count, 4);
-}
-
 static ssize_t pyra_sysfs_write_profile_settings(struct file *fp,
                struct kobject *kobj, struct bin_attribute *attr, char *buf,
                loff_t off, size_t count)
@@ -525,27 +447,32 @@ static struct bin_attribute pyra_bin_attributes[] = {
        {
                .attr = { .name = "profile1_settings", .mode = 0440 },
                .size = sizeof(struct pyra_profile_settings),
-               .read = pyra_sysfs_read_profile1_settings
+               .read = pyra_sysfs_read_profilex_settings,
+               .private = &profile_numbers[0]
        },
        {
                .attr = { .name = "profile2_settings", .mode = 0440 },
                .size = sizeof(struct pyra_profile_settings),
-               .read = pyra_sysfs_read_profile2_settings
+               .read = pyra_sysfs_read_profilex_settings,
+               .private = &profile_numbers[1]
        },
        {
                .attr = { .name = "profile3_settings", .mode = 0440 },
                .size = sizeof(struct pyra_profile_settings),
-               .read = pyra_sysfs_read_profile3_settings
+               .read = pyra_sysfs_read_profilex_settings,
+               .private = &profile_numbers[2]
        },
        {
                .attr = { .name = "profile4_settings", .mode = 0440 },
                .size = sizeof(struct pyra_profile_settings),
-               .read = pyra_sysfs_read_profile4_settings
+               .read = pyra_sysfs_read_profilex_settings,
+               .private = &profile_numbers[3]
        },
        {
                .attr = { .name = "profile5_settings", .mode = 0440 },
                .size = sizeof(struct pyra_profile_settings),
-               .read = pyra_sysfs_read_profile5_settings
+               .read = pyra_sysfs_read_profilex_settings,
+               .private = &profile_numbers[4]
        },
        {
                .attr = { .name = "profile_buttons", .mode = 0220 },
@@ -555,27 +482,32 @@ static struct bin_attribute pyra_bin_attributes[] = {
        {
                .attr = { .name = "profile1_buttons", .mode = 0440 },
                .size = sizeof(struct pyra_profile_buttons),
-               .read = pyra_sysfs_read_profile1_buttons
+               .read = pyra_sysfs_read_profilex_buttons,
+               .private = &profile_numbers[0]
        },
        {
                .attr = { .name = "profile2_buttons", .mode = 0440 },
                .size = sizeof(struct pyra_profile_buttons),
-               .read = pyra_sysfs_read_profile2_buttons
+               .read = pyra_sysfs_read_profilex_buttons,
+               .private = &profile_numbers[1]
        },
        {
                .attr = { .name = "profile3_buttons", .mode = 0440 },
                .size = sizeof(struct pyra_profile_buttons),
-               .read = pyra_sysfs_read_profile3_buttons
+               .read = pyra_sysfs_read_profilex_buttons,
+               .private = &profile_numbers[2]
        },
        {
                .attr = { .name = "profile4_buttons", .mode = 0440 },
                .size = sizeof(struct pyra_profile_buttons),
-               .read = pyra_sysfs_read_profile4_buttons
+               .read = pyra_sysfs_read_profilex_buttons,
+               .private = &profile_numbers[3]
        },
        {
                .attr = { .name = "profile5_buttons", .mode = 0440 },
                .size = sizeof(struct pyra_profile_buttons),
-               .read = pyra_sysfs_read_profile5_buttons
+               .read = pyra_sysfs_read_profilex_buttons,
+               .private = &profile_numbers[4]
        },
        {
                .attr = { .name = "settings", .mode = 0660 },