diff options
Diffstat (limited to 'drivers/i2c/chips/via686a.c')
-rw-r--r-- | drivers/i2c/chips/via686a.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/drivers/i2c/chips/via686a.c b/drivers/i2c/chips/via686a.c index 6614a59cecd4..fefc24a9251a 100644 --- a/drivers/i2c/chips/via686a.c +++ b/drivers/i2c/chips/via686a.c | |||
@@ -386,26 +386,26 @@ static ssize_t set_in_max(struct device *dev, const char *buf, | |||
386 | } | 386 | } |
387 | #define show_in_offset(offset) \ | 387 | #define show_in_offset(offset) \ |
388 | static ssize_t \ | 388 | static ssize_t \ |
389 | show_in##offset (struct device *dev, char *buf) \ | 389 | show_in##offset (struct device *dev, struct device_attribute *attr, char *buf) \ |
390 | { \ | 390 | { \ |
391 | return show_in(dev, buf, offset); \ | 391 | return show_in(dev, buf, offset); \ |
392 | } \ | 392 | } \ |
393 | static ssize_t \ | 393 | static ssize_t \ |
394 | show_in##offset##_min (struct device *dev, char *buf) \ | 394 | show_in##offset##_min (struct device *dev, struct device_attribute *attr, char *buf) \ |
395 | { \ | 395 | { \ |
396 | return show_in_min(dev, buf, offset); \ | 396 | return show_in_min(dev, buf, offset); \ |
397 | } \ | 397 | } \ |
398 | static ssize_t \ | 398 | static ssize_t \ |
399 | show_in##offset##_max (struct device *dev, char *buf) \ | 399 | show_in##offset##_max (struct device *dev, struct device_attribute *attr, char *buf) \ |
400 | { \ | 400 | { \ |
401 | return show_in_max(dev, buf, offset); \ | 401 | return show_in_max(dev, buf, offset); \ |
402 | } \ | 402 | } \ |
403 | static ssize_t set_in##offset##_min (struct device *dev, \ | 403 | static ssize_t set_in##offset##_min (struct device *dev, struct device_attribute *attr, \ |
404 | const char *buf, size_t count) \ | 404 | const char *buf, size_t count) \ |
405 | { \ | 405 | { \ |
406 | return set_in_min(dev, buf, count, offset); \ | 406 | return set_in_min(dev, buf, count, offset); \ |
407 | } \ | 407 | } \ |
408 | static ssize_t set_in##offset##_max (struct device *dev, \ | 408 | static ssize_t set_in##offset##_max (struct device *dev, struct device_attribute *attr, \ |
409 | const char *buf, size_t count) \ | 409 | const char *buf, size_t count) \ |
410 | { \ | 410 | { \ |
411 | return set_in_max(dev, buf, count, offset); \ | 411 | return set_in_max(dev, buf, count, offset); \ |
@@ -460,26 +460,26 @@ static ssize_t set_temp_hyst(struct device *dev, const char *buf, | |||
460 | return count; | 460 | return count; |
461 | } | 461 | } |
462 | #define show_temp_offset(offset) \ | 462 | #define show_temp_offset(offset) \ |
463 | static ssize_t show_temp_##offset (struct device *dev, char *buf) \ | 463 | static ssize_t show_temp_##offset (struct device *dev, struct device_attribute *attr, char *buf) \ |
464 | { \ | 464 | { \ |
465 | return show_temp(dev, buf, offset - 1); \ | 465 | return show_temp(dev, buf, offset - 1); \ |
466 | } \ | 466 | } \ |
467 | static ssize_t \ | 467 | static ssize_t \ |
468 | show_temp_##offset##_over (struct device *dev, char *buf) \ | 468 | show_temp_##offset##_over (struct device *dev, struct device_attribute *attr, char *buf) \ |
469 | { \ | 469 | { \ |
470 | return show_temp_over(dev, buf, offset - 1); \ | 470 | return show_temp_over(dev, buf, offset - 1); \ |
471 | } \ | 471 | } \ |
472 | static ssize_t \ | 472 | static ssize_t \ |
473 | show_temp_##offset##_hyst (struct device *dev, char *buf) \ | 473 | show_temp_##offset##_hyst (struct device *dev, struct device_attribute *attr, char *buf) \ |
474 | { \ | 474 | { \ |
475 | return show_temp_hyst(dev, buf, offset - 1); \ | 475 | return show_temp_hyst(dev, buf, offset - 1); \ |
476 | } \ | 476 | } \ |
477 | static ssize_t set_temp_##offset##_over (struct device *dev, \ | 477 | static ssize_t set_temp_##offset##_over (struct device *dev, struct device_attribute *attr, \ |
478 | const char *buf, size_t count) \ | 478 | const char *buf, size_t count) \ |
479 | { \ | 479 | { \ |
480 | return set_temp_over(dev, buf, count, offset - 1); \ | 480 | return set_temp_over(dev, buf, count, offset - 1); \ |
481 | } \ | 481 | } \ |
482 | static ssize_t set_temp_##offset##_hyst (struct device *dev, \ | 482 | static ssize_t set_temp_##offset##_hyst (struct device *dev, struct device_attribute *attr, \ |
483 | const char *buf, size_t count) \ | 483 | const char *buf, size_t count) \ |
484 | { \ | 484 | { \ |
485 | return set_temp_hyst(dev, buf, count, offset - 1); \ | 485 | return set_temp_hyst(dev, buf, count, offset - 1); \ |
@@ -538,24 +538,24 @@ static ssize_t set_fan_div(struct device *dev, const char *buf, | |||
538 | } | 538 | } |
539 | 539 | ||
540 | #define show_fan_offset(offset) \ | 540 | #define show_fan_offset(offset) \ |
541 | static ssize_t show_fan_##offset (struct device *dev, char *buf) \ | 541 | static ssize_t show_fan_##offset (struct device *dev, struct device_attribute *attr, char *buf) \ |
542 | { \ | 542 | { \ |
543 | return show_fan(dev, buf, offset - 1); \ | 543 | return show_fan(dev, buf, offset - 1); \ |
544 | } \ | 544 | } \ |
545 | static ssize_t show_fan_##offset##_min (struct device *dev, char *buf) \ | 545 | static ssize_t show_fan_##offset##_min (struct device *dev, struct device_attribute *attr, char *buf) \ |
546 | { \ | 546 | { \ |
547 | return show_fan_min(dev, buf, offset - 1); \ | 547 | return show_fan_min(dev, buf, offset - 1); \ |
548 | } \ | 548 | } \ |
549 | static ssize_t show_fan_##offset##_div (struct device *dev, char *buf) \ | 549 | static ssize_t show_fan_##offset##_div (struct device *dev, struct device_attribute *attr, char *buf) \ |
550 | { \ | 550 | { \ |
551 | return show_fan_div(dev, buf, offset - 1); \ | 551 | return show_fan_div(dev, buf, offset - 1); \ |
552 | } \ | 552 | } \ |
553 | static ssize_t set_fan_##offset##_min (struct device *dev, \ | 553 | static ssize_t set_fan_##offset##_min (struct device *dev, struct device_attribute *attr, \ |
554 | const char *buf, size_t count) \ | 554 | const char *buf, size_t count) \ |
555 | { \ | 555 | { \ |
556 | return set_fan_min(dev, buf, count, offset - 1); \ | 556 | return set_fan_min(dev, buf, count, offset - 1); \ |
557 | } \ | 557 | } \ |
558 | static ssize_t set_fan_##offset##_div (struct device *dev, \ | 558 | static ssize_t set_fan_##offset##_div (struct device *dev, struct device_attribute *attr, \ |
559 | const char *buf, size_t count) \ | 559 | const char *buf, size_t count) \ |
560 | { \ | 560 | { \ |
561 | return set_fan_div(dev, buf, count, offset - 1); \ | 561 | return set_fan_div(dev, buf, count, offset - 1); \ |
@@ -570,7 +570,7 @@ show_fan_offset(1); | |||
570 | show_fan_offset(2); | 570 | show_fan_offset(2); |
571 | 571 | ||
572 | /* Alarms */ | 572 | /* Alarms */ |
573 | static ssize_t show_alarms(struct device *dev, char *buf) { | 573 | static ssize_t show_alarms(struct device *dev, struct device_attribute *attr, char *buf) { |
574 | struct via686a_data *data = via686a_update_device(dev); | 574 | struct via686a_data *data = via686a_update_device(dev); |
575 | return sprintf(buf,"%d\n", ALARMS_FROM_REG(data->alarms)); | 575 | return sprintf(buf,"%d\n", ALARMS_FROM_REG(data->alarms)); |
576 | } | 576 | } |