mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-28 21:33:52 +00:00
hwmon: (nct7904) Use new HWMON_CHANNEL_INFO() macro
The new macro simplifies the code, reduces the likelihood of errors, and makes the code easier to read. Signed-off-by: Guenter Roeck <linux@roeck-us.net>
This commit is contained in:
parent
4cdb562147
commit
4ec1d234a9
1 changed files with 46 additions and 82 deletions
|
@ -400,7 +400,8 @@ static int nct7904_detect(struct i2c_client *client,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static const u32 nct7904_in_config[] = {
|
||||
static const struct hwmon_channel_info *nct7904_info[] = {
|
||||
HWMON_CHANNEL_INFO(in,
|
||||
HWMON_I_INPUT, /* dummy, skipped in is_visible */
|
||||
HWMON_I_INPUT,
|
||||
HWMON_I_INPUT,
|
||||
|
@ -421,16 +422,8 @@ static const u32 nct7904_in_config[] = {
|
|||
HWMON_I_INPUT,
|
||||
HWMON_I_INPUT,
|
||||
HWMON_I_INPUT,
|
||||
HWMON_I_INPUT,
|
||||
0
|
||||
};
|
||||
|
||||
static const struct hwmon_channel_info nct7904_in = {
|
||||
.type = hwmon_in,
|
||||
.config = nct7904_in_config,
|
||||
};
|
||||
|
||||
static const u32 nct7904_fan_config[] = {
|
||||
HWMON_I_INPUT),
|
||||
HWMON_CHANNEL_INFO(fan,
|
||||
HWMON_F_INPUT,
|
||||
HWMON_F_INPUT,
|
||||
HWMON_F_INPUT,
|
||||
|
@ -438,29 +431,13 @@ static const u32 nct7904_fan_config[] = {
|
|||
HWMON_F_INPUT,
|
||||
HWMON_F_INPUT,
|
||||
HWMON_F_INPUT,
|
||||
HWMON_F_INPUT,
|
||||
0
|
||||
};
|
||||
|
||||
static const struct hwmon_channel_info nct7904_fan = {
|
||||
.type = hwmon_fan,
|
||||
.config = nct7904_fan_config,
|
||||
};
|
||||
|
||||
static const u32 nct7904_pwm_config[] = {
|
||||
HWMON_F_INPUT),
|
||||
HWMON_CHANNEL_INFO(pwm,
|
||||
HWMON_PWM_INPUT | HWMON_PWM_ENABLE,
|
||||
HWMON_PWM_INPUT | HWMON_PWM_ENABLE,
|
||||
HWMON_PWM_INPUT | HWMON_PWM_ENABLE,
|
||||
HWMON_PWM_INPUT | HWMON_PWM_ENABLE,
|
||||
0
|
||||
};
|
||||
|
||||
static const struct hwmon_channel_info nct7904_pwm = {
|
||||
.type = hwmon_pwm,
|
||||
.config = nct7904_pwm_config,
|
||||
};
|
||||
|
||||
static const u32 nct7904_temp_config[] = {
|
||||
HWMON_PWM_INPUT | HWMON_PWM_ENABLE),
|
||||
HWMON_CHANNEL_INFO(temp,
|
||||
HWMON_T_INPUT,
|
||||
HWMON_T_INPUT,
|
||||
HWMON_T_INPUT,
|
||||
|
@ -469,20 +446,7 @@ static const u32 nct7904_temp_config[] = {
|
|||
HWMON_T_INPUT,
|
||||
HWMON_T_INPUT,
|
||||
HWMON_T_INPUT,
|
||||
HWMON_T_INPUT,
|
||||
0
|
||||
};
|
||||
|
||||
static const struct hwmon_channel_info nct7904_temp = {
|
||||
.type = hwmon_temp,
|
||||
.config = nct7904_temp_config,
|
||||
};
|
||||
|
||||
static const struct hwmon_channel_info *nct7904_info[] = {
|
||||
&nct7904_in,
|
||||
&nct7904_fan,
|
||||
&nct7904_pwm,
|
||||
&nct7904_temp,
|
||||
HWMON_T_INPUT),
|
||||
NULL
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in a new issue