diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-21 02:15:32 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2010-05-24 10:02:25 -0400 |
commit | 5f2776293f7a4390f587642b1b7e1e6288e11a01 (patch) | |
tree | e1e5d7bd90593b4fb06e65bcca207746c899ec25 /drivers/hid | |
parent | d515e86e639890b33a09390d062b0831664f04a2 (diff) |
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 14bf62cde79423a02a590e02664ed29a36facec1 ("HID:
add driver for Roccat Kone gaming mouse") from the hid tree.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid')
-rw-r--r-- | drivers/hid/hid-roccat-kone.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/hid/hid-roccat-kone.c b/drivers/hid/hid-roccat-kone.c index 66e694054ba2..b6371d3fe0f9 100644 --- a/drivers/hid/hid-roccat-kone.c +++ b/drivers/hid/hid-roccat-kone.c | |||
@@ -263,7 +263,7 @@ static int kone_get_firmware_version(struct usb_device *usb_dev, int *result) | |||
263 | return 0; | 263 | return 0; |
264 | } | 264 | } |
265 | 265 | ||
266 | static ssize_t kone_sysfs_read_settings(struct kobject *kobj, | 266 | static ssize_t kone_sysfs_read_settings(struct file *fp, struct kobject *kobj, |
267 | struct bin_attribute *attr, char *buf, | 267 | struct bin_attribute *attr, char *buf, |
268 | loff_t off, size_t count) { | 268 | loff_t off, size_t count) { |
269 | struct device *dev = container_of(kobj, struct device, kobj); | 269 | struct device *dev = container_of(kobj, struct device, kobj); |
@@ -287,7 +287,7 @@ static ssize_t kone_sysfs_read_settings(struct kobject *kobj, | |||
287 | * This function keeps values in kone_device up to date and assumes that in | 287 | * This function keeps values in kone_device up to date and assumes that in |
288 | * case of error the old data is still valid | 288 | * case of error the old data is still valid |
289 | */ | 289 | */ |
290 | static ssize_t kone_sysfs_write_settings(struct kobject *kobj, | 290 | static ssize_t kone_sysfs_write_settings(struct file *fp, struct kobject *kobj, |
291 | struct bin_attribute *attr, char *buf, | 291 | struct bin_attribute *attr, char *buf, |
292 | loff_t off, size_t count) { | 292 | loff_t off, size_t count) { |
293 | struct device *dev = container_of(kobj, struct device, kobj); | 293 | struct device *dev = container_of(kobj, struct device, kobj); |
@@ -342,31 +342,31 @@ static ssize_t kone_sysfs_read_profilex(struct kobject *kobj, | |||
342 | return count; | 342 | return count; |
343 | } | 343 | } |
344 | 344 | ||
345 | static ssize_t kone_sysfs_read_profile1(struct kobject *kobj, | 345 | static ssize_t kone_sysfs_read_profile1(struct file *fp, struct kobject *kobj, |
346 | struct bin_attribute *attr, char *buf, | 346 | struct bin_attribute *attr, char *buf, |
347 | loff_t off, size_t count) { | 347 | loff_t off, size_t count) { |
348 | return kone_sysfs_read_profilex(kobj, attr, buf, off, count, 1); | 348 | return kone_sysfs_read_profilex(kobj, attr, buf, off, count, 1); |
349 | } | 349 | } |
350 | 350 | ||
351 | static ssize_t kone_sysfs_read_profile2(struct kobject *kobj, | 351 | static ssize_t kone_sysfs_read_profile2(struct file *fp, struct kobject *kobj, |
352 | struct bin_attribute *attr, char *buf, | 352 | struct bin_attribute *attr, char *buf, |
353 | loff_t off, size_t count) { | 353 | loff_t off, size_t count) { |
354 | return kone_sysfs_read_profilex(kobj, attr, buf, off, count, 2); | 354 | return kone_sysfs_read_profilex(kobj, attr, buf, off, count, 2); |
355 | } | 355 | } |
356 | 356 | ||
357 | static ssize_t kone_sysfs_read_profile3(struct kobject *kobj, | 357 | static ssize_t kone_sysfs_read_profile3(struct file *fp, struct kobject *kobj, |
358 | struct bin_attribute *attr, char *buf, | 358 | struct bin_attribute *attr, char *buf, |
359 | loff_t off, size_t count) { | 359 | loff_t off, size_t count) { |
360 | return kone_sysfs_read_profilex(kobj, attr, buf, off, count, 3); | 360 | return kone_sysfs_read_profilex(kobj, attr, buf, off, count, 3); |
361 | } | 361 | } |
362 | 362 | ||
363 | static ssize_t kone_sysfs_read_profile4(struct kobject *kobj, | 363 | static ssize_t kone_sysfs_read_profile4(struct file *fp, struct kobject *kobj, |
364 | struct bin_attribute *attr, char *buf, | 364 | struct bin_attribute *attr, char *buf, |
365 | loff_t off, size_t count) { | 365 | loff_t off, size_t count) { |
366 | return kone_sysfs_read_profilex(kobj, attr, buf, off, count, 4); | 366 | return kone_sysfs_read_profilex(kobj, attr, buf, off, count, 4); |
367 | } | 367 | } |
368 | 368 | ||
369 | static ssize_t kone_sysfs_read_profile5(struct kobject *kobj, | 369 | static ssize_t kone_sysfs_read_profile5(struct file *fp, struct kobject *kobj, |
370 | struct bin_attribute *attr, char *buf, | 370 | struct bin_attribute *attr, char *buf, |
371 | loff_t off, size_t count) { | 371 | loff_t off, size_t count) { |
372 | return kone_sysfs_read_profilex(kobj, attr, buf, off, count, 5); | 372 | 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 | return sizeof(struct kone_profile); | 404 | return sizeof(struct kone_profile); |
405 | } | 405 | } |
406 | 406 | ||
407 | static ssize_t kone_sysfs_write_profile1(struct kobject *kobj, | 407 | static ssize_t kone_sysfs_write_profile1(struct file *fp, struct kobject *kobj, |
408 | struct bin_attribute *attr, char *buf, | 408 | struct bin_attribute *attr, char *buf, |
409 | loff_t off, size_t count) { | 409 | loff_t off, size_t count) { |
410 | return kone_sysfs_write_profilex(kobj, attr, buf, off, count, 1); | 410 | return kone_sysfs_write_profilex(kobj, attr, buf, off, count, 1); |
411 | } | 411 | } |
412 | 412 | ||
413 | static ssize_t kone_sysfs_write_profile2(struct kobject *kobj, | 413 | static ssize_t kone_sysfs_write_profile2(struct file *fp, struct kobject *kobj, |
414 | struct bin_attribute *attr, char *buf, | 414 | struct bin_attribute *attr, char *buf, |
415 | loff_t off, size_t count) { | 415 | loff_t off, size_t count) { |
416 | return kone_sysfs_write_profilex(kobj, attr, buf, off, count, 2); | 416 | return kone_sysfs_write_profilex(kobj, attr, buf, off, count, 2); |
417 | } | 417 | } |
418 | 418 | ||
419 | static ssize_t kone_sysfs_write_profile3(struct kobject *kobj, | 419 | static ssize_t kone_sysfs_write_profile3(struct file *fp, struct kobject *kobj, |
420 | struct bin_attribute *attr, char *buf, | 420 | struct bin_attribute *attr, char *buf, |
421 | loff_t off, size_t count) { | 421 | loff_t off, size_t count) { |
422 | return kone_sysfs_write_profilex(kobj, attr, buf, off, count, 3); | 422 | return kone_sysfs_write_profilex(kobj, attr, buf, off, count, 3); |
423 | } | 423 | } |
424 | 424 | ||
425 | static ssize_t kone_sysfs_write_profile4(struct kobject *kobj, | 425 | static ssize_t kone_sysfs_write_profile4(struct file *fp, struct kobject *kobj, |
426 | struct bin_attribute *attr, char *buf, | 426 | struct bin_attribute *attr, char *buf, |
427 | loff_t off, size_t count) { | 427 | loff_t off, size_t count) { |
428 | return kone_sysfs_write_profilex(kobj, attr, buf, off, count, 4); | 428 | return kone_sysfs_write_profilex(kobj, attr, buf, off, count, 4); |
429 | } | 429 | } |
430 | 430 | ||
431 | static ssize_t kone_sysfs_write_profile5(struct kobject *kobj, | 431 | static ssize_t kone_sysfs_write_profile5(struct file *fp, struct kobject *kobj, |
432 | struct bin_attribute *attr, char *buf, | 432 | struct bin_attribute *attr, char *buf, |
433 | loff_t off, size_t count) { | 433 | loff_t off, size_t count) { |
434 | return kone_sysfs_write_profilex(kobj, attr, buf, off, count, 5); | 434 | return kone_sysfs_write_profilex(kobj, attr, buf, off, count, 5); |