@@ -320,7 +320,7 @@ struct it87_devices {
320
320
* second SIO address. Never exit configuration mode on these
321
321
* chips to avoid the problem.
322
322
*/
323
- #define FEAT_CONF_NOEXIT BIT(19) /* Chip should not exit conf mode */
323
+ #define FEAT_NOCONF BIT(19) /* Chip conf mode enabled on startup */
324
324
#define FEAT_FOUR_FANS BIT(20) /* Supports four fans */
325
325
#define FEAT_FOUR_PWM BIT(21) /* Supports four fan controls */
326
326
#define FEAT_FOUR_TEMP BIT(22)
@@ -452,7 +452,7 @@ static const struct it87_devices it87_devices[] = {
452
452
.model = "IT8790E" ,
453
453
.features = FEAT_NEWER_AUTOPWM | FEAT_12MV_ADC | FEAT_16BIT_FANS
454
454
| FEAT_TEMP_OFFSET | FEAT_TEMP_PECI | FEAT_IN7_INTERNAL
455
- | FEAT_PWM_FREQ2 | FEAT_FANCTL_ONOFF | FEAT_CONF_NOEXIT ,
455
+ | FEAT_PWM_FREQ2 | FEAT_FANCTL_ONOFF | FEAT_NOCONF ,
456
456
.peci_mask = 0x07 ,
457
457
},
458
458
[it8792 ] = {
@@ -461,7 +461,7 @@ static const struct it87_devices it87_devices[] = {
461
461
.features = FEAT_NEWER_AUTOPWM | FEAT_16BIT_FANS
462
462
| FEAT_TEMP_OFFSET | FEAT_TEMP_OLD_PECI | FEAT_TEMP_PECI
463
463
| FEAT_10_9MV_ADC | FEAT_IN7_INTERNAL | FEAT_FANCTL_ONOFF
464
- | FEAT_CONF_NOEXIT ,
464
+ | FEAT_NOCONF ,
465
465
.peci_mask = 0x07 ,
466
466
.old_peci_mask = 0x02 , /* Actually reports PCH */
467
467
},
@@ -507,7 +507,7 @@ static const struct it87_devices it87_devices[] = {
507
507
.features = FEAT_NEWER_AUTOPWM | FEAT_16BIT_FANS
508
508
| FEAT_TEMP_OFFSET | FEAT_TEMP_OLD_PECI | FEAT_TEMP_PECI
509
509
| FEAT_10_9MV_ADC | FEAT_IN7_INTERNAL | FEAT_FANCTL_ONOFF
510
- | FEAT_CONF_NOEXIT ,
510
+ | FEAT_NOCONF ,
511
511
.peci_mask = 0x07 ,
512
512
.old_peci_mask = 0x02 , /* Actually reports PCH */
513
513
},
@@ -544,7 +544,7 @@ static const struct it87_devices it87_devices[] = {
544
544
#define has_four_temp (data ) ((data)->features & FEAT_FOUR_TEMP)
545
545
#define has_six_temp (data ) ((data)->features & FEAT_SIX_TEMP)
546
546
#define has_vin3_5v (data ) ((data)->features & FEAT_VIN3_5V)
547
- #define has_conf_noexit (data ) ((data)->features & FEAT_CONF_NOEXIT )
547
+ #define has_noconf (data ) ((data)->features & FEAT_NOCONF )
548
548
#define has_scaling (data ) ((data)->features & (FEAT_12MV_ADC | \
549
549
FEAT_10_9MV_ADC))
550
550
#define has_fanctl_onoff (data ) ((data)->features & FEAT_FANCTL_ONOFF)
@@ -748,7 +748,7 @@ static int smbus_disable(struct it87_data *data)
748
748
superio_select (data -> sioaddr , PME );
749
749
superio_outb (data -> sioaddr , IT87_SPECIAL_CFG_REG ,
750
750
data -> ec_special_config & ~data -> smbus_bitmap );
751
- superio_exit (data -> sioaddr , has_conf_noexit (data ));
751
+ superio_exit (data -> sioaddr , has_noconf (data ));
752
752
}
753
753
return 0 ;
754
754
}
@@ -765,7 +765,7 @@ static int smbus_enable(struct it87_data *data)
765
765
superio_select (data -> sioaddr , PME );
766
766
superio_outb (data -> sioaddr , IT87_SPECIAL_CFG_REG ,
767
767
data -> ec_special_config );
768
- superio_exit (data -> sioaddr , has_conf_noexit (data ));
768
+ superio_exit (data -> sioaddr , has_noconf (data ));
769
769
}
770
770
return 0 ;
771
771
}
@@ -3143,7 +3143,7 @@ static int __init it87_find(int sioaddr, unsigned short *address,
3143
3143
}
3144
3144
3145
3145
exit :
3146
- superio_exit (sioaddr , config ? has_conf_noexit (config ) : false);
3146
+ superio_exit (sioaddr , config ? has_noconf (config ) : false);
3147
3147
return err ;
3148
3148
}
3149
3149
@@ -3540,7 +3540,7 @@ static void it87_resume_sio(struct platform_device *pdev)
3540
3540
reg2c );
3541
3541
}
3542
3542
3543
- superio_exit (data -> sioaddr , has_conf_noexit (data ));
3543
+ superio_exit (data -> sioaddr , has_noconf (data ));
3544
3544
}
3545
3545
3546
3546
static int it87_resume (struct device * dev )
0 commit comments