git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.3
[linux-2.6.git]
/
drivers
/
i2c
/
chips
/
w83781d.c
diff --git
a/drivers/i2c/chips/w83781d.c
b/drivers/i2c/chips/w83781d.c
index
ac378b5
..
063d34a
100644
(file)
--- a/
drivers/i2c/chips/w83781d.c
+++ b/
drivers/i2c/chips/w83781d.c
@@
-60,7
+60,7
@@
I2C_CLIENT_MODULE_PARM(force_subclients, "List of subclient addresses: "
"{bus, clientaddr, subclientaddr1, subclientaddr2}");
static int init = 1;
"{bus, clientaddr, subclientaddr1, subclientaddr2}");
static int init = 1;
-
MODULE_PARM(init, "i"
);
+
module_param(init, bool, 0
);
MODULE_PARM_DESC(init, "Set to zero to bypass chip initialization");
/* Constants specified below */
MODULE_PARM_DESC(init, "Set to zero to bypass chip initialization");
/* Constants specified below */
@@
-320,7
+320,7
@@
show_regs_in_##offset (struct device *dev, char *buf) \
{ \
return show_in(dev, buf, 0x##offset); \
} \
{ \
return show_in(dev, buf, 0x##offset); \
} \
-static DEVICE_ATTR(in##offset##_input, S_IRUGO, show_regs_in_##offset, NULL)
+static DEVICE_ATTR(in##offset##_input, S_IRUGO, show_regs_in_##offset, NULL)
;
#define sysfs_in_reg_offset(reg, offset) \
static ssize_t show_regs_in_##reg##offset (struct device *dev, char *buf) \
#define sysfs_in_reg_offset(reg, offset) \
static ssize_t show_regs_in_##reg##offset (struct device *dev, char *buf) \
@@
-331,7
+331,7
@@
static ssize_t store_regs_in_##reg##offset (struct device *dev, const char *buf,
{ \
return store_in_##reg (dev, buf, count, 0x##offset); \
} \
{ \
return store_in_##reg (dev, buf, count, 0x##offset); \
} \
-static DEVICE_ATTR(in##offset##_##reg, S_IRUGO| S_IWUSR, show_regs_in_##reg##offset, store_regs_in_##reg##offset)
+static DEVICE_ATTR(in##offset##_##reg, S_IRUGO| S_IWUSR, show_regs_in_##reg##offset, store_regs_in_##reg##offset)
;
#define sysfs_in_offsets(offset) \
sysfs_in_offset(offset); \
#define sysfs_in_offsets(offset) \
sysfs_in_offset(offset); \
@@
-386,7
+386,7
@@
static ssize_t show_regs_fan_##offset (struct device *dev, char *buf) \
{ \
return show_fan(dev, buf, 0x##offset); \
} \
{ \
return show_fan(dev, buf, 0x##offset); \
} \
-static DEVICE_ATTR(fan##offset##_input, S_IRUGO, show_regs_fan_##offset, NULL)
+static DEVICE_ATTR(fan##offset##_input, S_IRUGO, show_regs_fan_##offset, NULL)
;
#define sysfs_fan_min_offset(offset) \
static ssize_t show_regs_fan_min##offset (struct device *dev, char *buf) \
#define sysfs_fan_min_offset(offset) \
static ssize_t show_regs_fan_min##offset (struct device *dev, char *buf) \
@@
-397,7
+397,7
@@
static ssize_t store_regs_fan_min##offset (struct device *dev, const char *buf,
{ \
return store_fan_min(dev, buf, count, 0x##offset); \
} \
{ \
return store_fan_min(dev, buf, count, 0x##offset); \
} \
-static DEVICE_ATTR(fan##offset##_min, S_IRUGO | S_IWUSR, show_regs_fan_min##offset, store_regs_fan_min##offset)
+static DEVICE_ATTR(fan##offset##_min, S_IRUGO | S_IWUSR, show_regs_fan_min##offset, store_regs_fan_min##offset)
;
sysfs_fan_offset(1);
sysfs_fan_min_offset(1);
sysfs_fan_offset(1);
sysfs_fan_min_offset(1);
@@
-466,7
+466,7
@@
show_regs_temp_##offset (struct device *dev, char *buf) \
{ \
return show_temp(dev, buf, 0x##offset); \
} \
{ \
return show_temp(dev, buf, 0x##offset); \
} \
-static DEVICE_ATTR(temp##offset##_input, S_IRUGO, show_regs_temp_##offset, NULL)
+static DEVICE_ATTR(temp##offset##_input, S_IRUGO, show_regs_temp_##offset, NULL)
;
#define sysfs_temp_reg_offset(reg, offset) \
static ssize_t show_regs_temp_##reg##offset (struct device *dev, char *buf) \
#define sysfs_temp_reg_offset(reg, offset) \
static ssize_t show_regs_temp_##reg##offset (struct device *dev, char *buf) \
@@
-477,7
+477,7
@@
static ssize_t store_regs_temp_##reg##offset (struct device *dev, const char *bu
{ \
return store_temp_##reg (dev, buf, count, 0x##offset); \
} \
{ \
return store_temp_##reg (dev, buf, count, 0x##offset); \
} \
-static DEVICE_ATTR(temp##offset##_##reg, S_IRUGO| S_IWUSR, show_regs_temp_##reg##offset, store_regs_temp_##reg##offset)
+static DEVICE_ATTR(temp##offset##_##reg, S_IRUGO| S_IWUSR, show_regs_temp_##reg##offset, store_regs_temp_##reg##offset)
;
#define sysfs_temp_offsets(offset) \
sysfs_temp_offset(offset); \
#define sysfs_temp_offsets(offset) \
sysfs_temp_offset(offset); \
@@
-503,9
+503,9
@@
show_vid_reg(struct device *dev, char *buf)
}
static
}
static
-DEVICE_ATTR(
in0_ref, S_IRUGO, show_vid_reg, NULL)
+DEVICE_ATTR(
cpu0_vid, S_IRUGO, show_vid_reg, NULL);
#define device_create_file_vid(client) \
#define device_create_file_vid(client) \
-device_create_file(&client->dev, &dev_attr_
in0_ref
);
+device_create_file(&client->dev, &dev_attr_
cpu0_vid
);
static ssize_t
show_vrm_reg(struct device *dev, char *buf)
{
static ssize_t
show_vrm_reg(struct device *dev, char *buf)
{
@@
-527,7
+527,7
@@
store_vrm_reg(struct device *dev, const char *buf, size_t count)
}
static
}
static
-DEVICE_ATTR(vrm, S_IRUGO | S_IWUSR, show_vrm_reg, store_vrm_reg)
+DEVICE_ATTR(vrm, S_IRUGO | S_IWUSR, show_vrm_reg, store_vrm_reg)
;
#define device_create_file_vrm(client) \
device_create_file(&client->dev, &dev_attr_vrm);
static ssize_t
#define device_create_file_vrm(client) \
device_create_file(&client->dev, &dev_attr_vrm);
static ssize_t
@@
-538,7
+538,7
@@
show_alarms_reg(struct device *dev, char *buf)
}
static
}
static
-DEVICE_ATTR(alarms, S_IRUGO, show_alarms_reg, NULL)
+DEVICE_ATTR(alarms, S_IRUGO, show_alarms_reg, NULL)
;
#define device_create_file_alarms(client) \
device_create_file(&client->dev, &dev_attr_alarms);
static ssize_t show_beep_mask (struct device *dev, char *buf)
#define device_create_file_alarms(client) \
device_create_file(&client->dev, &dev_attr_alarms);
static ssize_t show_beep_mask (struct device *dev, char *buf)
@@
-598,7
+598,7
@@
static ssize_t store_regs_beep_##reg (struct device *dev, const char *buf, size_
{ \
return store_beep_reg(dev, buf, count, BEEP_##REG); \
} \
{ \
return store_beep_reg(dev, buf, count, BEEP_##REG); \
} \
-static DEVICE_ATTR(beep_##reg, S_IRUGO | S_IWUSR, show_regs_beep_##reg, store_regs_beep_##reg)
+static DEVICE_ATTR(beep_##reg, S_IRUGO | S_IWUSR, show_regs_beep_##reg, store_regs_beep_##reg)
;
sysfs_beep(ENABLE, enable);
sysfs_beep(MASK, mask);
sysfs_beep(ENABLE, enable);
sysfs_beep(MASK, mask);
@@
-665,7
+665,7
@@
static ssize_t store_regs_fan_div_##offset (struct device *dev, const char *buf,
{ \
return store_fan_div_reg(dev, buf, count, offset - 1); \
} \
{ \
return store_fan_div_reg(dev, buf, count, offset - 1); \
} \
-static DEVICE_ATTR(fan##offset##_div, S_IRUGO | S_IWUSR, show_regs_fan_div_##offset, store_regs_fan_div_##offset)
+static DEVICE_ATTR(fan##offset##_div, S_IRUGO | S_IWUSR, show_regs_fan_div_##offset, store_regs_fan_div_##offset)
;
sysfs_fan_div(1);
sysfs_fan_div(2);
sysfs_fan_div(1);
sysfs_fan_div(2);
@@
-744,7
+744,7
@@
static ssize_t store_regs_pwm_##offset (struct device *dev, const char *buf, siz
{ \
return store_pwm_reg(dev, buf, count, offset); \
} \
{ \
return store_pwm_reg(dev, buf, count, offset); \
} \
-static DEVICE_ATTR(fan##offset##_pwm, S_IRUGO | S_IWUSR, show_regs_pwm_##offset, store_regs_pwm_##offset)
+static DEVICE_ATTR(fan##offset##_pwm, S_IRUGO | S_IWUSR, show_regs_pwm_##offset, store_regs_pwm_##offset)
;
#define sysfs_pwmenable(offset) \
static ssize_t show_regs_pwmenable_##offset (struct device *dev, char *buf) \
#define sysfs_pwmenable(offset) \
static ssize_t show_regs_pwmenable_##offset (struct device *dev, char *buf) \
@@
-755,7
+755,7
@@
static ssize_t store_regs_pwmenable_##offset (struct device *dev, const char *bu
{ \
return store_pwmenable_reg(dev, buf, count, offset); \
} \
{ \
return store_pwmenable_reg(dev, buf, count, offset); \
} \
-static DEVICE_ATTR(fan##offset##_pwm_enable, S_IRUGO | S_IWUSR, show_regs_pwmenable_##offset, store_regs_pwmenable_##offset)
+static DEVICE_ATTR(fan##offset##_pwm_enable, S_IRUGO | S_IWUSR, show_regs_pwmenable_##offset, store_regs_pwmenable_##offset)
;
sysfs_pwm(1);
sysfs_pwm(2);
sysfs_pwm(1);
sysfs_pwm(2);
@@
-815,8
+815,7
@@
store_sensor_reg(struct device *dev, const char *buf, size_t count, int nr)
data->sens[nr - 1] = val;
break;
default:
data->sens[nr - 1] = val;
break;
default:
- dev_err(&client->dev,
- "Invalid sensor type %ld; must be 1, 2, or %d\n",
+ dev_err(dev, "Invalid sensor type %ld; must be 1, 2, or %d\n",
(long) val, W83781D_DEFAULT_BETA);
break;
}
(long) val, W83781D_DEFAULT_BETA);
break;
}
@@
-833,7
+832,7
@@
static ssize_t store_regs_sensor_##offset (struct device *dev, const char *buf,
{ \
return store_sensor_reg(dev, buf, count, offset); \
} \
{ \
return store_sensor_reg(dev, buf, count, offset); \
} \
-static DEVICE_ATTR(temp##offset##_type, S_IRUGO | S_IWUSR, show_regs_sensor_##offset, store_regs_sensor_##offset)
+static DEVICE_ATTR(temp##offset##_type, S_IRUGO | S_IWUSR, show_regs_sensor_##offset, store_regs_sensor_##offset)
;
sysfs_sensor(1);
sysfs_sensor(2);
sysfs_sensor(1);
sysfs_sensor(2);
@@
-891,7
+890,7
@@
static ssize_t store_regs_rt_##offset (struct device *dev, const char *buf, size
{ \
return store_rt_reg(dev, buf, count, offset); \
} \
{ \
return store_rt_reg(dev, buf, count, offset); \
} \
-static DEVICE_ATTR(rt##offset, S_IRUGO | S_IWUSR, show_regs_rt_##offset, store_regs_rt_##offset)
+static DEVICE_ATTR(rt##offset, S_IRUGO | S_IWUSR, show_regs_rt_##offset, store_regs_rt_##offset)
;
sysfs_rt(1);
sysfs_rt(2);
sysfs_rt(1);
sysfs_rt(2);
@@
-1491,7
+1490,7
@@
static void
w83781d_init_client(struct i2c_client *client)
{
struct w83781d_data *data = i2c_get_clientdata(client);
w83781d_init_client(struct i2c_client *client)
{
struct w83781d_data *data = i2c_get_clientdata(client);
- int
vid = 0,
i, p;
+ int i, p;
int type = data->type;
u8 tmp;
int type = data->type;
u8 tmp;
@@
-1513,14
+1512,7
@@
w83781d_init_client(struct i2c_client *client)
w83781d_write_value(client, W83781D_REG_BEEP_INTS2, 0);
}
w83781d_write_value(client, W83781D_REG_BEEP_INTS2, 0);
}
- if (type != w83697hf) {
- vid = w83781d_read_value(client, W83781D_REG_VID_FANDIV) & 0x0f;
- vid |=
- (w83781d_read_value(client, W83781D_REG_CHIPID) & 0x01) <<
- 4;
- data->vrm = DEFAULT_VRM;
- vid = vid_from_reg(vid, data->vrm);
- }
+ data->vrm = i2c_which_vrm();
if ((type != w83781d) && (type != as99127f)) {
tmp = w83781d_read_value(client, W83781D_REG_SCFG1);
if ((type != w83781d) && (type != as99127f)) {
tmp = w83781d_read_value(client, W83781D_REG_SCFG1);
@@
-1600,7
+1592,7
@@
static struct w83781d_data *w83781d_update_device(struct device *dev)
if (time_after
(jiffies - data->last_updated, (unsigned long) (HZ + HZ / 2))
|| time_before(jiffies, data->last_updated) || !data->valid) {
if (time_after
(jiffies - data->last_updated, (unsigned long) (HZ + HZ / 2))
|| time_before(jiffies, data->last_updated) || !data->valid) {
-
pr_debug(
"Starting device update\n");
+
dev_dbg(dev,
"Starting device update\n");
for (i = 0; i <= 8; i++) {
if ((data->type == w83783s || data->type == w83697hf)
for (i = 0; i <= 8; i++) {
if ((data->type == w83783s || data->type == w83697hf)