diff options
Diffstat (limited to 'drivers/macintosh/therm_adt746x.c')
-rw-r--r-- | drivers/macintosh/therm_adt746x.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/macintosh/therm_adt746x.c b/drivers/macintosh/therm_adt746x.c index d09308f30960..5ba190ce14a0 100644 --- a/drivers/macintosh/therm_adt746x.c +++ b/drivers/macintosh/therm_adt746x.c | |||
@@ -455,21 +455,22 @@ static int attach_one_thermostat(struct i2c_adapter *adapter, int addr, | |||
455 | * pass around to the attribute functions, so we don't really have | 455 | * pass around to the attribute functions, so we don't really have |
456 | * choice but implement a bunch of them... | 456 | * choice but implement a bunch of them... |
457 | * | 457 | * |
458 | * FIXME, it does now... | ||
458 | */ | 459 | */ |
459 | #define BUILD_SHOW_FUNC_INT(name, data) \ | 460 | #define BUILD_SHOW_FUNC_INT(name, data) \ |
460 | static ssize_t show_##name(struct device *dev, char *buf) \ | 461 | static ssize_t show_##name(struct device *dev, struct device_attribute *attr, char *buf) \ |
461 | { \ | 462 | { \ |
462 | return sprintf(buf, "%d\n", data); \ | 463 | return sprintf(buf, "%d\n", data); \ |
463 | } | 464 | } |
464 | 465 | ||
465 | #define BUILD_SHOW_FUNC_STR(name, data) \ | 466 | #define BUILD_SHOW_FUNC_STR(name, data) \ |
466 | static ssize_t show_##name(struct device *dev, char *buf) \ | 467 | static ssize_t show_##name(struct device *dev, struct device_attribute *attr, char *buf) \ |
467 | { \ | 468 | { \ |
468 | return sprintf(buf, "%s\n", data); \ | 469 | return sprintf(buf, "%s\n", data); \ |
469 | } | 470 | } |
470 | 471 | ||
471 | #define BUILD_SHOW_FUNC_FAN(name, data) \ | 472 | #define BUILD_SHOW_FUNC_FAN(name, data) \ |
472 | static ssize_t show_##name(struct device *dev, char *buf) \ | 473 | static ssize_t show_##name(struct device *dev, struct device_attribute *attr, char *buf) \ |
473 | { \ | 474 | { \ |
474 | return sprintf(buf, "%d (%d rpm)\n", \ | 475 | return sprintf(buf, "%d (%d rpm)\n", \ |
475 | thermostat->last_speed[data], \ | 476 | thermostat->last_speed[data], \ |
@@ -478,7 +479,7 @@ static ssize_t show_##name(struct device *dev, char *buf) \ | |||
478 | } | 479 | } |
479 | 480 | ||
480 | #define BUILD_STORE_FUNC_DEG(name, data) \ | 481 | #define BUILD_STORE_FUNC_DEG(name, data) \ |
481 | static ssize_t store_##name(struct device *dev, const char *buf, size_t n) \ | 482 | static ssize_t store_##name(struct device *dev, struct device_attribute *attr, const char *buf, size_t n) \ |
482 | { \ | 483 | { \ |
483 | int val; \ | 484 | int val; \ |
484 | int i; \ | 485 | int i; \ |
@@ -491,7 +492,7 @@ static ssize_t store_##name(struct device *dev, const char *buf, size_t n) \ | |||
491 | } | 492 | } |
492 | 493 | ||
493 | #define BUILD_STORE_FUNC_INT(name, data) \ | 494 | #define BUILD_STORE_FUNC_INT(name, data) \ |
494 | static ssize_t store_##name(struct device *dev, const char *buf, size_t n) \ | 495 | static ssize_t store_##name(struct device *dev, struct device_attribute *attr, const char *buf, size_t n) \ |
495 | { \ | 496 | { \ |
496 | u32 val; \ | 497 | u32 val; \ |
497 | val = simple_strtoul(buf, NULL, 10); \ | 498 | val = simple_strtoul(buf, NULL, 10); \ |