Commit f83a9cb6 authored by Guenter Roeck's avatar Guenter Roeck

hwmon: (it87) Use feature macros on sio_data

Feature macros work on sio_data as well, so use them there.
Reviewed-by: default avatarJean Delvare <jdelvare@suse.de>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
parent 8416915c
...@@ -1821,6 +1821,7 @@ static int __init it87_find(unsigned short *address, ...@@ -1821,6 +1821,7 @@ static int __init it87_find(unsigned short *address,
int err; int err;
u16 chip_type; u16 chip_type;
const char *board_vendor, *board_name; const char *board_vendor, *board_name;
const struct it87_devices *config;
err = superio_enter(); err = superio_enter();
if (err) if (err)
...@@ -1905,8 +1906,10 @@ static int __init it87_find(unsigned short *address, ...@@ -1905,8 +1906,10 @@ static int __init it87_find(unsigned short *address,
it87_devices[sio_data->type].suffix, it87_devices[sio_data->type].suffix,
*address, sio_data->revision); *address, sio_data->revision);
config = &it87_devices[sio_data->type];
/* in7 (VSB or VCCH5V) is always internal on some chips */ /* 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); sio_data->internal |= (1 << 1);
/* in8 (Vbat) is always internal */ /* in8 (Vbat) is always internal */
...@@ -1916,7 +1919,7 @@ static int __init it87_find(unsigned short *address, ...@@ -1916,7 +1919,7 @@ static int __init it87_find(unsigned short *address,
if (sio_data->type != it8603) if (sio_data->type != it8603)
sio_data->skip_in |= (1 << 9); sio_data->skip_in |= (1 << 9);
if (!(it87_devices[sio_data->type].features & FEAT_VID)) if (!has_vid(config))
sio_data->skip_vid = 1; sio_data->skip_vid = 1;
/* Read GPIO config and VID value from LDN 7 (GPIO) */ /* Read GPIO config and VID value from LDN 7 (GPIO) */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment