diff options
| author | Edward A. James <eajames@us.ibm.com> | 2017-08-10 16:57:47 -0500 |
|---|---|---|
| committer | Guenter Roeck <linux@roeck-us.net> | 2017-08-13 08:24:38 -0700 |
| commit | a66a6eb9db10bd630bacf31e33505302c8e8303c (patch) | |
| tree | 7fd6bd0ba5e735b8588a4482eed83e4f2635c384 /drivers/hwmon | |
| parent | 384548e569c82dc1e018dcdfd7e19c4b9f87c6b5 (diff) | |
| download | linux-a66a6eb9db10bd630bacf31e33505302c8e8303c.tar.gz | |
hwmon: (pmbus): Switch status registers to 16 bit
Switch the storage of status registers to 16 bit values. This allows us
to store all the bits of STATUS_WORD.
Signed-off-by: Edward A. James <eajames@us.ibm.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Diffstat (limited to 'drivers/hwmon')
| -rw-r--r-- | drivers/hwmon/pmbus/pmbus_core.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c index f1eff6b6c798..4ec75862ca7e 100644 --- a/drivers/hwmon/pmbus/pmbus_core.c +++ b/drivers/hwmon/pmbus/pmbus_core.c @@ -112,7 +112,7 @@ struct pmbus_data { * A single status register covers multiple attributes, * so we keep them all together. */ - u8 status[PB_NUM_STATUS_REG]; + u16 status[PB_NUM_STATUS_REG]; u8 status_register; u8 currpage; @@ -716,10 +716,10 @@ static int pmbus_get_boolean(struct pmbus_data *data, struct pmbus_boolean *b, { struct pmbus_sensor *s1 = b->s1; struct pmbus_sensor *s2 = b->s2; - u16 reg = (index >> 8) & 0xffff; - u8 mask = index & 0xff; + u16 reg = (index >> 16) & 0xffff; + u16 mask = index & 0xffff; int ret, status; - u8 regval; + u16 regval; status = data->status[reg]; if (status < 0) @@ -860,7 +860,7 @@ static int pmbus_add_boolean(struct pmbus_data *data, const char *name, const char *type, int seq, struct pmbus_sensor *s1, struct pmbus_sensor *s2, - u16 reg, u8 mask) + u16 reg, u16 mask) { struct pmbus_boolean *boolean; struct sensor_device_attribute *a; @@ -876,7 +876,7 @@ static int pmbus_add_boolean(struct pmbus_data *data, boolean->s1 = s1; boolean->s2 = s2; pmbus_attr_init(a, boolean->name, S_IRUGO, pmbus_show_boolean, NULL, - (reg << 8) | mask); + (reg << 16) | mask); return pmbus_add_attribute(data, &a->dev_attr.attr); } @@ -962,7 +962,7 @@ struct pmbus_limit_attr { */ struct pmbus_sensor_attr { u16 reg; /* sensor register */ - u8 gbit; /* generic status bit */ + u16 gbit; /* generic status bit */ u8 nlimit; /* # of limit registers */ enum pmbus_sensor_classes class;/* sensor class */ const char *label; /* sensor label */ |