Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6

[linux-2.6] / drivers / i2c / chips / smsc47m1.c

diff --git a/drivers/i2c/chips/smsc47m1.c b/drivers/i2c/chips/smsc47m1.c
index 0e12ca3694131fa875ae168ea29f0ced72d381f7..13d6d4a8bc7d0e906d09a2a20468dce111d1e457 100644 (file)
--- a/drivers/i2c/chips/smsc47m1.c
+++ b/drivers/i2c/chips/smsc47m1.c
@@ -184,7 +184,7 @@ static ssize_t get_pwm_en(struct device *dev, char *buf, int nr)
        return sprintf(buf, "%d\n", PWM_EN_FROM_REG(data->pwm[nr]));
 }
 
-static ssize_t get_alarms(struct device *dev, char *buf)
+static ssize_t get_alarms(struct device *dev, struct device_attribute *attr, char *buf)
 {
        struct smsc47m1_data *data = smsc47m1_update_device(dev, 0);
        return sprintf(buf, "%d\n", data->alarms);
@@ -298,42 +298,42 @@ static ssize_t set_pwm_en(struct device *dev, const char *buf,
 }
 
 #define fan_present(offset)                                            \
-static ssize_t get_fan##offset (struct device *dev, char *buf)         \
+static ssize_t get_fan##offset (struct device *dev, struct device_attribute *attr, char *buf)          \
 {                                                                      \
        return get_fan(dev, buf, offset - 1);                           \
 }                                                                      \
-static ssize_t get_fan##offset##_min (struct device *dev, char *buf)   \
+static ssize_t get_fan##offset##_min (struct device *dev, struct device_attribute *attr, char *buf)    \
 {                                                                      \
        return get_fan_min(dev, buf, offset - 1);                       \
 }                                                                      \
-static ssize_t set_fan##offset##_min (struct device *dev,              \
+static ssize_t set_fan##offset##_min (struct device *dev, struct device_attribute *attr,               \
                const char *buf, size_t count)                          \
 {                                                                      \
        return set_fan_min(dev, buf, count, offset - 1);                \
 }                                                                      \
-static ssize_t get_fan##offset##_div (struct device *dev, char *buf)   \
+static ssize_t get_fan##offset##_div (struct device *dev, struct device_attribute *attr, char *buf)    \
 {                                                                      \
        return get_fan_div(dev, buf, offset - 1);                       \
 }                                                                      \
-static ssize_t set_fan##offset##_div (struct device *dev,              \
+static ssize_t set_fan##offset##_div (struct device *dev, struct device_attribute *attr,               \
                const char *buf, size_t count)                          \
 {                                                                      \
        return set_fan_div(dev, buf, count, offset - 1);                \
 }                                                                      \
-static ssize_t get_pwm##offset (struct device *dev, char *buf)         \
+static ssize_t get_pwm##offset (struct device *dev, struct device_attribute *attr, char *buf)          \
 {                                                                      \
        return get_pwm(dev, buf, offset - 1);                           \
 }                                                                      \
-static ssize_t set_pwm##offset (struct device *dev,                    \
+static ssize_t set_pwm##offset (struct device *dev, struct device_attribute *attr,                     \
                const char *buf, size_t count)                          \
 {                                                                      \
        return set_pwm(dev, buf, count, offset - 1);                    \
 }                                                                      \
-static ssize_t get_pwm##offset##_en (struct device *dev, char *buf)    \
+static ssize_t get_pwm##offset##_en (struct device *dev, struct device_attribute *attr, char *buf)     \
 {                                                                      \
        return get_pwm_en(dev, buf, offset - 1);                        \
 }                                                                      \
-static ssize_t set_pwm##offset##_en (struct device *dev,               \
+static ssize_t set_pwm##offset##_en (struct device *dev, struct device_attribute *attr,                \
                const char *buf, size_t count)                          \
 {                                                                      \
        return set_pwm_en(dev, buf, count, offset - 1);                 \