* second SIO address. Never exit configuration mode on these
  * chips to avoid the problem.
  */
-#define FEAT_CONF_NOEXIT       BIT(19) /* Chip should not exit conf mode */
+#define FEAT_NOCONF            BIT(19) /* Chip conf mode enabled on startup */
 #define FEAT_FOUR_FANS         BIT(20) /* Supports four fans */
 #define FEAT_FOUR_PWM          BIT(21) /* Supports four fan controls */
 #define FEAT_FOUR_TEMP         BIT(22)
                .model = "IT8790E",
                .features = FEAT_NEWER_AUTOPWM | FEAT_12MV_ADC | FEAT_16BIT_FANS
                  | FEAT_TEMP_OFFSET | FEAT_TEMP_PECI | FEAT_IN7_INTERNAL
-                 | FEAT_PWM_FREQ2 | FEAT_FANCTL_ONOFF | FEAT_CONF_NOEXIT,
+                 | FEAT_PWM_FREQ2 | FEAT_FANCTL_ONOFF | FEAT_NOCONF,
                .peci_mask = 0x07,
        },
        [it8792] = {
                .features = FEAT_NEWER_AUTOPWM | FEAT_16BIT_FANS
                  | FEAT_TEMP_OFFSET | FEAT_TEMP_OLD_PECI | FEAT_TEMP_PECI
                  | FEAT_10_9MV_ADC | FEAT_IN7_INTERNAL | FEAT_FANCTL_ONOFF
-                 | FEAT_CONF_NOEXIT,
+                 | FEAT_NOCONF,
                .peci_mask = 0x07,
                .old_peci_mask = 0x02,  /* Actually reports PCH */
        },
                .features = FEAT_NEWER_AUTOPWM | FEAT_16BIT_FANS
                  | FEAT_TEMP_OFFSET | FEAT_TEMP_OLD_PECI | FEAT_TEMP_PECI
                  | FEAT_10_9MV_ADC | FEAT_IN7_INTERNAL | FEAT_FANCTL_ONOFF
-                 | FEAT_CONF_NOEXIT,
+                 | FEAT_NOCONF,
                .peci_mask = 0x07,
                .old_peci_mask = 0x02,  /* Actually reports PCH */
        },
 #define has_four_temp(data)    ((data)->features & FEAT_FOUR_TEMP)
 #define has_six_temp(data)     ((data)->features & FEAT_SIX_TEMP)
 #define has_vin3_5v(data)      ((data)->features & FEAT_VIN3_5V)
-#define has_conf_noexit(data)  ((data)->features & FEAT_CONF_NOEXIT)
+#define has_noconf(data)       ((data)->features & FEAT_NOCONF)
 #define has_scaling(data)      ((data)->features & (FEAT_12MV_ADC | \
                                                     FEAT_10_9MV_ADC))
 #define has_fanctl_onoff(data) ((data)->features & FEAT_FANCTL_ONOFF)
                superio_select(data->sioaddr, PME);
                superio_outb(data->sioaddr, IT87_SPECIAL_CFG_REG,
                             data->ec_special_config & ~data->smbus_bitmap);
-               superio_exit(data->sioaddr, has_conf_noexit(data));
+               superio_exit(data->sioaddr, has_noconf(data));
        }
        return 0;
 }
                superio_select(data->sioaddr, PME);
                superio_outb(data->sioaddr, IT87_SPECIAL_CFG_REG,
                             data->ec_special_config);
-               superio_exit(data->sioaddr, has_conf_noexit(data));
+               superio_exit(data->sioaddr, has_noconf(data));
        }
        return 0;
 }
        }
 
 exit:
-       superio_exit(sioaddr, config ? has_conf_noexit(config) : false);
+       superio_exit(sioaddr, config ? has_noconf(config) : false);
        return err;
 }
 
                             reg2c);
        }
 
-       superio_exit(data->sioaddr, has_conf_noexit(data));
+       superio_exit(data->sioaddr, has_noconf(data));
 }
 
 static int it87_resume(struct device *dev)