summaryrefslogtreecommitdiffstats
path: root/drivers/hwmon
diff options
context:
space:
mode:
authorGuenter Roeck <linux@roeck-us.net>2015-03-31 09:31:34 -0700
committerGuenter Roeck <linux@roeck-us.net>2015-04-09 06:39:11 -0700
commitf83a9cb6228472a464c2ab4abb9bd1e83939aec2 (patch)
tree87b03308cce032571d90209cbf9f35338068637f /drivers/hwmon
parent8416915c16d4335980c5d5d6d39957adbfe40b55 (diff)
downloadop-kernel-dev-f83a9cb6228472a464c2ab4abb9bd1e83939aec2.zip
op-kernel-dev-f83a9cb6228472a464c2ab4abb9bd1e83939aec2.tar.gz
hwmon: (it87) Use feature macros on sio_data
Feature macros work on sio_data as well, so use them there. Reviewed-by: Jean Delvare <jdelvare@suse.de> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Diffstat (limited to 'drivers/hwmon')
-rw-r--r--drivers/hwmon/it87.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/hwmon/it87.c b/drivers/hwmon/it87.c
index 8acbe8f..d0ee556 100644
--- a/drivers/hwmon/it87.c
+++ b/drivers/hwmon/it87.c
@@ -1821,6 +1821,7 @@ static int __init it87_find(unsigned short *address,
int err;
u16 chip_type;
const char *board_vendor, *board_name;
+ const struct it87_devices *config;
err = superio_enter();
if (err)
@@ -1905,8 +1906,10 @@ static int __init it87_find(unsigned short *address,
it87_devices[sio_data->type].suffix,
*address, sio_data->revision);
+ config = &it87_devices[sio_data->type];
+
/* in7 (VSB or VCCH5V) is always internal on some chips */
- if (it87_devices[sio_data->type].features & FEAT_IN7_INTERNAL)
+ if (has_in7_internal(config))
sio_data->internal |= (1 << 1);
/* in8 (Vbat) is always internal */
@@ -1916,7 +1919,7 @@ static int __init it87_find(unsigned short *address,
if (sio_data->type != it8603)
sio_data->skip_in |= (1 << 9);
- if (!(it87_devices[sio_data->type].features & FEAT_VID))
+ if (!has_vid(config))
sio_data->skip_vid = 1;
/* Read GPIO config and VID value from LDN 7 (GPIO) */
OpenPOWER on IntegriCloud