mir/lm-sensors
2
0
Fork 0
mirror of https://github.com/lm-sensors/lm-sensors synced 2025-09-02 23:35:57 +00:00
Code Issues Releases Wiki Activity

in4 fixes + more cleanup

Browse Source 
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@1068 7894878c-1315-0410-8ee3-d5d059ff63e0
This commit is contained in:
Mark D. Studebaker
2001-04-10 01:47:56 +00:00
parent bea2bbf99e
commit 0ac4a8d35b
1 changed files with 13 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
kernel/chips/sis5595.c
View File

@@ -165,13 +165,9 @@ extern int init_module(void);
extern int cleanup_module(void); extern int cleanup_module(void);
#endif /* MODULE */ #endif /* MODULE */
/* This module may seem overly long and complicated. In fact, it is not so /* For the SIS5595, we need to keep some data in memory. That
bad. Quite a lot of bookkeeping is done. A real driver can often cut
some corners. */
/* For each registered SIS5595, we need to keep some data in memory. That
data is pointed to by sis5595_list[NR]->data. The structure itself is data is pointed to by sis5595_list[NR]->data. The structure itself is
dynamically allocated, at the same time when a new sis5595 client is dynamically allocated, at the time when the new sis5595 client is
allocated. */ allocated. */
struct sis5595_data { struct sis5595_data {
struct semaphore lock; struct semaphore lock;
@@ -182,14 +178,14 @@ struct sis5595_data {
unsigned long last_updated; /* In jiffies */ unsigned long last_updated; /* In jiffies */
char maxins; /* == 3 if temp enabled, otherwise == 4 */ char maxins; /* == 3 if temp enabled, otherwise == 4 */
u8 in[4]; /* Register value */ u8 in[5]; /* Register value */
u8 in_max[4]; /* Register value */ u8 in_max[5]; /* Register value */
u8 in_min[4]; /* Register value */ u8 in_min[5]; /* Register value */
u8 fan[2]; /* Register value */ u8 fan[2]; /* Register value */
u8 fan_min[2]; /* Register value */ u8 fan_min[2]; /* Register value */
u8 temp; /* Register value */ u8 temp; /* Register value */
u8 temp_over; /* Register value */ u8 temp_over; /* Register value - really max */
u8 temp_hyst; /* Register value */ u8 temp_hyst; /* Register value - really min */
u8 fan_div[2]; /* Register encoding, shifted right */ u8 fan_div[2]; /* Register encoding, shifted right */
u16 alarms; /* Register encoding, combined */ u16 alarms; /* Register encoding, combined */
}; };
@@ -340,8 +336,7 @@ int sis5595_detect(struct i2c_adapter *adapter, int address,
} }
if (check_region(address, SIS5595_EXTENT)) { if (check_region(address, SIS5595_EXTENT)) {
printk("sis5595.o: region 0x%x already in use!\n", printk("sis5595.o: region 0x%x already in use!\n", address);
address);
return -ENODEV; return -ENODEV;
} }
@@ -625,19 +620,16 @@ void sis5595_fan(struct i2c_client *client, int operation, int ctl_name,
else if (operation == SENSORS_PROC_REAL_READ) { else if (operation == SENSORS_PROC_REAL_READ) {
sis5595_update_client(client); sis5595_update_client(client);
results[0] = FAN_FROM_REG(data->fan_min[nr - 1], results[0] = FAN_FROM_REG(data->fan_min[nr - 1],
DIV_FROM_REG(data-> DIV_FROM_REG(data->fan_div[nr - 1]));
fan_div[nr - 1])); results[1] = FAN_FROM_REG(data->fan[nr - 1],
results[1] = DIV_FROM_REG(data->fan_div[nr - 1]));
FAN_FROM_REG(data->fan[nr - 1],
DIV_FROM_REG(data->fan_div[nr - 1]));
*nrels_mag = 2; *nrels_mag = 2;
} else if (operation == SENSORS_PROC_REAL_WRITE) { } else if (operation == SENSORS_PROC_REAL_WRITE) {
if (*nrels_mag >= 1) { if (*nrels_mag >= 1) {
data->fan_min[nr - 1] = FAN_TO_REG(results[0], data->fan_min[nr - 1] = FAN_TO_REG(results[0],
DIV_FROM_REG DIV_FROM_REG
(data-> (data->
fan_div[nr - fan_div[nr-1]));
1]));
sis5595_write_value(client, sis5595_write_value(client,
SIS5595_REG_FAN_MIN(nr), SIS5595_REG_FAN_MIN(nr),
data->fan_min[nr - 1]); data->fan_min[nr - 1]);
@@ -716,8 +708,7 @@ void sis5595_fan_div(struct i2c_client *client, int operation,
if (*nrels_mag >= 1) { if (*nrels_mag >= 1) {
data->fan_div[0] = DIV_TO_REG(results[0]); data->fan_div[0] = DIV_TO_REG(results[0]);
old = (old & 0xcf) | (data->fan_div[0] << 4); old = (old & 0xcf) | (data->fan_div[0] << 4);
sis5595_write_value(client, SIS5595_REG_FANDIV, sis5595_write_value(client, SIS5595_REG_FANDIV, old);
old);
} }
} }
} }