From: Guenter Roeck Date: Tue, 31 Mar 2015 16:31:34 +0000 (-0700) Subject: hwmon: (it87) Use feature macros on sio_data X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f83a9cb6228472a464c2ab4abb9bd1e83939aec2;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git hwmon: (it87) Use feature macros on sio_data Feature macros work on sio_data as well, so use them there. Reviewed-by: Jean Delvare Signed-off-by: Guenter Roeck --- diff --git a/drivers/hwmon/it87.c b/drivers/hwmon/it87.c index 8acbe8f852d1..d0ee556e8ce0 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) */