Commit 4ec1d234 authored by Guenter Roeck's avatar Guenter Roeck
Browse files

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: default avatarGuenter Roeck <linux@roeck-us.net>
parent 4cdb5621

drivers/hwmon/nct7904.c

+46 −82
Original line number Diff line number Diff line
@@ -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,30 +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_T_INPUT,

			   HWMON_PWM_INPUT | HWMON_PWM_ENABLE),

	HWMON_CHANNEL_INFO(temp,

			   HWMON_T_INPUT,

			   HWMON_T_INPUT,

			   HWMON_T_INPUT,
@@ -470,19 +446,7 @@ static const u32 nct7904_temp_config[] = { 
			   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

};