aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/i2c/chips/it87.c
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2005-05-16 12:52:38 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2005-06-22 00:51:57 -0400
commit68188ba7de2db9999ff08a4544a78b2f10eb08bd (patch)
tree37e0406d7f2b6ace2bc73043bda0c745d3aa5e37 /drivers/i2c/chips/it87.c
parentff3240946d6a3d9f2ecf273f7330e09eec5484eb (diff)
[PATCH] I2C: Kill common macro abuse in chip drivers
This patch kills a common macro abuse in i2c chip drivers: defining ALARMS_FROM_REG returning its argument unchanged. Dropping the macro makes the code somewhat more readable IMHO. Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/i2c/chips/it87.c')
-rw-r--r--drivers/i2c/chips/it87.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/i2c/chips/it87.c b/drivers/i2c/chips/it87.c
index 16dbfd8dac1b..7984bf920d31 100644
--- a/drivers/i2c/chips/it87.c
+++ b/drivers/i2c/chips/it87.c
@@ -172,8 +172,6 @@ static inline u8 FAN_TO_REG(long rpm, int div)
172 ((val)+500)/1000),-128,127)) 172 ((val)+500)/1000),-128,127))
173#define TEMP_FROM_REG(val) (((val)>0x80?(val)-0x100:(val))*1000) 173#define TEMP_FROM_REG(val) (((val)>0x80?(val)-0x100:(val))*1000)
174 174
175#define ALARMS_FROM_REG(val) (val)
176
177#define PWM_TO_REG(val) ((val) >> 1) 175#define PWM_TO_REG(val) ((val) >> 1)
178#define PWM_FROM_REG(val) (((val)&0x7f) << 1) 176#define PWM_FROM_REG(val) (((val)&0x7f) << 1)
179 177
@@ -665,7 +663,7 @@ show_pwm_offset(3);
665static ssize_t show_alarms(struct device *dev, struct device_attribute *attr, char *buf) 663static ssize_t show_alarms(struct device *dev, struct device_attribute *attr, char *buf)
666{ 664{
667 struct it87_data *data = it87_update_device(dev); 665 struct it87_data *data = it87_update_device(dev);
668 return sprintf(buf,"%d\n", ALARMS_FROM_REG(data->alarms)); 666 return sprintf(buf, "%u\n", data->alarms);
669} 667}
670static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL); 668static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
671 669