Skip to content

L
linux
Commit 5f277629 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Jiri Kosina
Browse files
Options

HID: fix hid-roccat-kone for bin_attr API change 

After merging the driver-core tree, today's linux-next build (x86_64
allmodconfig) produced these warnings:

drivers/hid/hid-roccat-kone.c:694: warning: initialization from incompatible pointer type
drivers/hid/hid-roccat-kone.c:696: warning: initialization from incompatible pointer type
drivers/hid/hid-roccat-kone.c:701: warning: initialization from incompatible pointer type
drivers/hid/hid-roccat-kone.c:703: warning: initialization from incompatible pointer type
drivers/hid/hid-roccat-kone.c:708: warning: initialization from incompatible pointer type
drivers/hid/hid-roccat-kone.c:710: warning: initialization from incompatible pointer type
drivers/hid/hid-roccat-kone.c:715: warning: initialization from incompatible pointer type
drivers/hid/hid-roccat-kone.c:717: warning: initialization from incompatible pointer type
drivers/hid/hid-roccat-kone.c:722: warning: initialization from incompatible pointer type
drivers/hid/hid-roccat-kone.c:724: warning: initialization from incompatible pointer type
drivers/hid/hid-roccat-kone.c:729: warning: initialization from incompatible pointer type
drivers/hid/hid-roccat-kone.c:731: warning: initialization from incompatible pointer type

Introduced by commit 867040163f10f2b52b45bc573f330d6eb28f5914 ("sysfs:
add struct file* to bin_attr callbacks") from the driver-core tree
interacting with commit 14bf62cd ("HID:
add driver for Roccat Kone gaming mouse") from the hid tree.
Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent d515e86e
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 12 deletions
drivers/hid/hid-roccat-kone.c
View file @ 5f277629
...@@ -263,7 +263,7 @@ static int kone_get_firmware_version(struct usb_device *usb_dev, int *result) ...@@ -263,7 +263,7 @@ static int kone_get_firmware_version(struct usb_device *usb_dev, int *result)
return 0; return 0;
} }
static ssize_t kone_sysfs_read_settings(struct kobject *kobj, static ssize_t kone_sysfs_read_settings(struct file *fp, struct kobject *kobj,
struct bin_attribute *attr, char *buf, struct bin_attribute *attr, char *buf,
loff_t off, size_t count) { loff_t off, size_t count) {
struct device *dev = container_of(kobj, struct device, kobj); struct device *dev = container_of(kobj, struct device, kobj);
...@@ -287,7 +287,7 @@ static ssize_t kone_sysfs_read_settings(struct kobject *kobj, ...@@ -287,7 +287,7 @@ static ssize_t kone_sysfs_read_settings(struct kobject *kobj,
* This function keeps values in kone_device up to date and assumes that in * This function keeps values in kone_device up to date and assumes that in
* case of error the old data is still valid * case of error the old data is still valid
*/ */
static ssize_t kone_sysfs_write_settings(struct kobject *kobj, static ssize_t kone_sysfs_write_settings(struct file *fp, struct kobject *kobj,
struct bin_attribute *attr, char *buf, struct bin_attribute *attr, char *buf,
loff_t off, size_t count) { loff_t off, size_t count) {
struct device *dev = container_of(kobj, struct device, kobj); struct device *dev = container_of(kobj, struct device, kobj);
...@@ -342,31 +342,31 @@ static ssize_t kone_sysfs_read_profilex(struct kobject *kobj, ...@@ -342,31 +342,31 @@ static ssize_t kone_sysfs_read_profilex(struct kobject *kobj,
return count; return count;
} }
static ssize_t kone_sysfs_read_profile1(struct kobject *kobj, static ssize_t kone_sysfs_read_profile1(struct file *fp, struct kobject *kobj,
struct bin_attribute *attr, char *buf, struct bin_attribute *attr, char *buf,
loff_t off, size_t count) { loff_t off, size_t count) {
return kone_sysfs_read_profilex(kobj, attr, buf, off, count, 1); return kone_sysfs_read_profilex(kobj, attr, buf, off, count, 1);
} }
static ssize_t kone_sysfs_read_profile2(struct kobject *kobj, static ssize_t kone_sysfs_read_profile2(struct file *fp, struct kobject *kobj,
struct bin_attribute *attr, char *buf, struct bin_attribute *attr, char *buf,
loff_t off, size_t count) { loff_t off, size_t count) {
return kone_sysfs_read_profilex(kobj, attr, buf, off, count, 2); return kone_sysfs_read_profilex(kobj, attr, buf, off, count, 2);
} }
static ssize_t kone_sysfs_read_profile3(struct kobject *kobj, static ssize_t kone_sysfs_read_profile3(struct file *fp, struct kobject *kobj,
struct bin_attribute *attr, char *buf, struct bin_attribute *attr, char *buf,
loff_t off, size_t count) { loff_t off, size_t count) {
return kone_sysfs_read_profilex(kobj, attr, buf, off, count, 3); return kone_sysfs_read_profilex(kobj, attr, buf, off, count, 3);
} }
static ssize_t kone_sysfs_read_profile4(struct kobject *kobj, static ssize_t kone_sysfs_read_profile4(struct file *fp, struct kobject *kobj,
struct bin_attribute *attr, char *buf, struct bin_attribute *attr, char *buf,
loff_t off, size_t count) { loff_t off, size_t count) {
return kone_sysfs_read_profilex(kobj, attr, buf, off, count, 4); return kone_sysfs_read_profilex(kobj, attr, buf, off, count, 4);
} }
static ssize_t kone_sysfs_read_profile5(struct kobject *kobj, static ssize_t kone_sysfs_read_profile5(struct file *fp, struct kobject *kobj,
struct bin_attribute *attr, char *buf, struct bin_attribute *attr, char *buf,
loff_t off, size_t count) { loff_t off, size_t count) {
return kone_sysfs_read_profilex(kobj, attr, buf, off, count, 5); return kone_sysfs_read_profilex(kobj, attr, buf, off, count, 5);
...@@ -404,31 +404,31 @@ static ssize_t kone_sysfs_write_profilex(struct kobject *kobj, ...@@ -404,31 +404,31 @@ static ssize_t kone_sysfs_write_profilex(struct kobject *kobj,
return sizeof(struct kone_profile); return sizeof(struct kone_profile);
} }
static ssize_t kone_sysfs_write_profile1(struct kobject *kobj, static ssize_t kone_sysfs_write_profile1(struct file *fp, struct kobject *kobj,
struct bin_attribute *attr, char *buf, struct bin_attribute *attr, char *buf,
loff_t off, size_t count) { loff_t off, size_t count) {
return kone_sysfs_write_profilex(kobj, attr, buf, off, count, 1); return kone_sysfs_write_profilex(kobj, attr, buf, off, count, 1);
} }
static ssize_t kone_sysfs_write_profile2(struct kobject *kobj, static ssize_t kone_sysfs_write_profile2(struct file *fp, struct kobject *kobj,
struct bin_attribute *attr, char *buf, struct bin_attribute *attr, char *buf,
loff_t off, size_t count) { loff_t off, size_t count) {
return kone_sysfs_write_profilex(kobj, attr, buf, off, count, 2); return kone_sysfs_write_profilex(kobj, attr, buf, off, count, 2);
} }
static ssize_t kone_sysfs_write_profile3(struct kobject *kobj, static ssize_t kone_sysfs_write_profile3(struct file *fp, struct kobject *kobj,
struct bin_attribute *attr, char *buf, struct bin_attribute *attr, char *buf,
loff_t off, size_t count) { loff_t off, size_t count) {
return kone_sysfs_write_profilex(kobj, attr, buf, off, count, 3); return kone_sysfs_write_profilex(kobj, attr, buf, off, count, 3);
} }
static ssize_t kone_sysfs_write_profile4(struct kobject *kobj, static ssize_t kone_sysfs_write_profile4(struct file *fp, struct kobject *kobj,
struct bin_attribute *attr, char *buf, struct bin_attribute *attr, char *buf,
loff_t off, size_t count) { loff_t off, size_t count) {
return kone_sysfs_write_profilex(kobj, attr, buf, off, count, 4); return kone_sysfs_write_profilex(kobj, attr, buf, off, count, 4);
} }
static ssize_t kone_sysfs_write_profile5(struct kobject *kobj, static ssize_t kone_sysfs_write_profile5(struct file *fp, struct kobject *kobj,
struct bin_attribute *attr, char *buf, struct bin_attribute *attr, char *buf,
loff_t off, size_t count) { loff_t off, size_t count) {
return kone_sysfs_write_profilex(kobj, attr, buf, off, count, 5); return kone_sysfs_write_profilex(kobj, attr, buf, off, count, 5);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7