Skip to contentSkip to conversation

hwmon: (f75375s) Shift control mode to the correct bit position

PATCH Applied Guillem Jover 2 participants 2 messages Sep 3, 2010 – Sep 5, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 hwmon: (f75375s) Shift control mode to the correct bit position

The spec notes that fan0 and fan1 control mode bits are located in bits 7-6 and 5-4 respectively, but the FAN_CTRL_MODE macro was making the bits shift by 5 instead of by 4.

---
 drivers/hwmon/f75375s.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/hwmon/f75375s.c +1 -1
index 0f58ecc..e5828c0 100644
@@ -79,7 +79,7 @@ enum chips { f75373, f75375 };
 #define F75375_REG_PWM2_DROP_DUTY	0x6C
 
 #define FAN_CTRL_LINEAR(nr)		(4 + nr)
-#define FAN_CTRL_MODE(nr)		(5 + ((nr) * 2))
+#define FAN_CTRL_MODE(nr)		(4 + ((nr) * 2))
 
 /*
  * Data structures and manipulation thereof
Signature · 7 lines
1.7.1


_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
#1 lore raw

Hi Guillem,

Quoted 14 lines · Guillem Jover

The spec notes that fan0 and fan1 control mode bits are located in bits 7-6 and 5-4 respectively, but the FAN_CTRL_MODE macro was making the bits shift by 5 instead of by 4.

---
 drivers/hwmon/f75375s.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/hwmon/f75375s.c +0 -0
index 0f58ecc..e5828c0 100644

drivers/hwmon/f75375s.c enum chips { f75373, f75375 }; · line 85

Quoted 8 lines
drivers/hwmon/f75375s.c +1 -1
@@ -79,7 +79,7 @@ enum chips { f75373, f75375 };
 #define F75375_REG_PWM2_DROP_DUTY	0x6C
 
 #define FAN_CTRL_LINEAR(nr)		(4 + nr)
-#define FAN_CTRL_MODE(nr)		(5 + ((nr) * 2))
+#define FAN_CTRL_MODE(nr)		(4 + ((nr) * 2))
 
 /*
  * Data structures and manipulation thereof

Good catch, patch applied, thanks.

Note though that it seems that this driver needs some more love in this area. Struct f75375_data has a member fan_timer to which the contents of register 0x60 (F75375_REG_FAN_TIMER) is written in f75375_update_device(), but this value isn't used anywhere. Secondly, struct member pwm_mode is _not_ initialized anywhere, although show_pwm_mode() exports it to user-space. And member pwm_enable is worse, the fans are set to full speed arbitrarily when the driver is loaded (in function f75375_init()), which is bad practice. So there is definitely room for cleanups and improvements, if you are interested in this driver.

Signature · 6 lines
Jean Delvare

_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors