hwmon: (w83627ehf) remove nct6775 and nct6776 support
cover hwmon: (w83627ehf) remove nct6775 and nct6776 support
Guenter pointed out that we should remove the nct677[56] from w83627ehf since there's a separate nct6775.c driver.
It removes a quite satisfying amount of code.
Built ontop of hwmon-next 848a25f01ee.
Dave
Dr. David Alan Gilbert (3):
hwmon: (w83627ehf) remove nct6775 and nct6776 support
hwmon: (w83627ehf) Remove code not needed after nct677* removal
hwmon: (w83627ehf) Now only one intrusion channel
drivers/hwmon/Kconfig | 5 +- drivers/hwmon/w83627ehf.c | 624 +++++--------------------------------- 2 files changed, 74 insertions(+), 555 deletions(-)
Signature · 1 line
2.24.1
PATCH 1/3 hwmon: (w83627ehf) remove nct6775 and nct6776 support
The nct6775 and nct6776 are supported by the separate nct6775.c driver, so remove the code from the w83627ehf driver.
--- drivers/hwmon/Kconfig | 5 +- drivers/hwmon/w83627ehf.c | 477 ++++---------------------------------- 2 files changed, 41 insertions(+), 441 deletions(-)
drivers/hwmon/Kconfig +2 -3
@@ -1915,7 +1915,7 @@ config SENSORS_W83627HF will be called w83627hf. config SENSORS_W83627EHF - tristate "Winbond W83627EHF/EHG/DHG/UHG, W83667HG, NCT6775F, NCT6776F" + tristate "Winbond W83627EHF/EHG/DHG/UHG, W83667HG" depends on !PPC select HWMON_VID help
@@ -1928,8 +1928,7 @@ config SENSORS_W83627EHF the Core 2 Duo. And also the W83627UHG, which is a stripped down version of the W83627DHG (as far as hardware monitoring goes.) - This driver also supports Nuvoton W83667HG, W83667HG-B, NCT6775F - (also known as W83667HG-I), and NCT6776F. + This driver also supports Nuvoton W83667HG and W83667HG-B. This driver can also be built as a module. If so, the module will be called w83627ehf.
drivers/hwmon/w83627ehf.c +39 -438
681 lines not on this page · raw message
Signature · 1 line
2.24.1
PATCH 2/3 hwmon: (w83627ehf) Remove code not needed after nct677* removal
In reply to Dr. David Alan GilbertNow the nct677* are gone, we can clean up some flags that are always the same now and simplify some code.
--- drivers/hwmon/w83627ehf.c | 138 +++++++++----------------------------- 1 file changed, 32 insertions(+), 106 deletions(-)
drivers/hwmon/w83627ehf.c +32 -106
@@ -65,10 +65,6 @@ static unsigned short force_id;module_param (force_id, ushort,0 );MODULE_PARM_DESC (force_id,"Override the detected device ID" ); -static unsigned short fan_debounce; -module_param (fan_debounce, ushort,0 ); -MODULE_PARM_DESC (fan_debounce,"Enable debouncing for fan RPM signal" ); -#define DRVNAME "w83627ehf"/*
@@ -309,7 +305,6 @@ static inline u8 in_to_reg(u32 val, u8 nr, const u16 *scale_in)struct w83627ehf_data {int addr;/* IO base of hw monitor block */ const char *name; -enum kinds kind;/* Convenience copy of sio_data->kind */ struct mutex lock;
@@ -320,20 +315,10 @@ struct w83627ehf_data {u8 temp_src[NUM_REG_TEMP ];const char *const *temp_label; -const u16 *REG_PWM ; -const u16 *REG_TARGET ; -const u16 *REG_FAN ; -const u16 *REG_FAN_MIN ; -const u16 *REG_FAN_START_OUTPUT ; -const u16 *REG_FAN_STOP_OUTPUT ; -const u16 *REG_FAN_STOP_TIME ;const u16 *REG_FAN_MAX_OUTPUT ;const u16 *REG_FAN_STEP_OUTPUT ;const u16 *scale_in; -unsigned int (*fan_from_reg)(u16 reg,unsigned int divreg); -unsigned int (*fan_from_reg_min)(u16 reg,unsigned int divreg); -struct mutex update_lock;char valid;/* !=0 if following fields are valid */ unsigned long last_updated;/* In jiffies */
@@ -349,7 +334,6 @@ struct w83627ehf_data {u8 fan_div[5 ];u8 has_fan;/* some fan inputs can be disabled */ u8 has_fan_min;/* some fans don't have min register */ -bool has_fan_div;u8 temp_type[3 ];s8 temp_offset[3 ];s16 temp[9 ];
@@ -527,12 +511,6 @@ static void w83627ehf_write_fan_div(struct w83627ehf_data *data, int nr) } } -static void w83627ehf_write_fan_div_common (struct device *dev, -struct w83627ehf_data *data,int nr) -{ -w83627ehf_write_fan_div (data, nr); -} -static void w83627ehf_update_fan_div (struct w83627ehf_data *data) {int i;
@@ -558,12 +536,6 @@ static void w83627ehf_update_fan_div(struct w83627ehf_data *data) } } -static void w83627ehf_update_fan_div_common (struct device *dev, -struct w83627ehf_data *data) -{ -w83627ehf_update_fan_div (data); -} -static void w83627ehf_update_pwm (struct w83627ehf_data *data) {int i;
@@ -584,18 +556,12 @@ static void w83627ehf_update_pwm(struct w83627ehf_data *data) ((pwmcfg >>W83627EHF_PWM_MODE_SHIFT [i]) &1 ) ?0 :1 ; data->pwm_enable[i] = ((pwmcfg >>W83627EHF_PWM_ENABLE_SHIFT [i]) &3 ) +1 ; - data->pwm[i] =w83627ehf_read_value (data, data->REG_PWM[i]); + data->pwm[i] =w83627ehf_read_value (data,W83627EHF_REG_PWM [i]); data->tolerance[i] = (tolerance >> (i ==1 ?4 :0 )) &0x0f ; } } -static void w83627ehf_update_pwm_common (struct device *dev, -struct w83627ehf_data *data) -{ -w83627ehf_update_pwm (data); -} -static struct w83627ehf_data *w83627ehf_update_device (struct device *dev) {struct w83627ehf_data *data =dev_get_drvdata (dev);
@@ -606,7 +572,7 @@ static struct w83627ehf_data *w83627ehf_update_device(struct device *dev)if (time_after (jiffies, data->last_updated +HZ +HZ /2 ) || !data->valid) {/* Fan clock dividers */ -w83627ehf_update_fan_div_common (dev, data); +w83627ehf_update_fan_div (data);/* Measured voltages and limits */ for (i =0 ; i < data->in_num; i++) {
@@ -628,39 +594,36 @@ static struct w83627ehf_data *w83627ehf_update_device(struct device *dev)if (!(data->has_fan & (1 << i)))continue ; - reg =w83627ehf_read_value (data, data->REG_FAN[i]); - data->rpm[i] = data->fan_from_reg (reg, - data->fan_div[i]); + reg =w83627ehf_read_value (data,W83627EHF_REG_FAN [i]); + data->rpm[i] =fan_from_reg8 (reg, data->fan_div[i]);if (data->has_fan_min & (1 << i)) data->fan_min[i] =w83627ehf_read_value (data, - data->REG_FAN_MIN[i]); +W83627EHF_REG_FAN_MIN [i]);/* * If we failed to measure the fan speed and clock * divider can be increased, let's try that for next * time */ -if (data->has_fan_div - && reg >=0xff - && data->fan_div[i] <0x07 ) { +if (reg >=0xff && data->fan_div[i] <0x07 ) {dev_dbg (dev,"Increasing fan%d clock divider from %u to %u\n" , i +1 ,div_from_reg (data->fan_div[i]),div_from_reg (data->fan_div[i] +1 )); data->fan_div[i]++; -w83627ehf_write_fan_div_common (dev, data, i); +w83627ehf_write_fan_div (data, i);/* Preserve min limit if possible */ if ((data->has_fan_min & (1 << i)) && data->fan_min[i] >=2 && data->fan_min[i] !=255 )w83627ehf_write_value (data, - data->REG_FAN_MIN[i], +W83627EHF_REG_FAN_MIN [i], (data->fan_min[i] /=2 )); } } -w83627ehf_update_pwm_common (dev, data); +w83627ehf_update_pwm (data);for (i =0 ; i < data->pwm_num; i++) {if (!(data->has_fan & (1 << i)))
@@ -668,13 +631,13 @@ static struct w83627ehf_data *w83627ehf_update_device(struct device *dev) data->fan_start_output[i] =w83627ehf_read_value (data, - data->REG_FAN_START_OUTPUT[i]); +W83627EHF_REG_FAN_START_OUTPUT [i]); data->fan_stop_output[i] =w83627ehf_read_value (data, - data->REG_FAN_STOP_OUTPUT[i]); +W83627EHF_REG_FAN_STOP_OUTPUT [i]); data->fan_stop_time[i] =w83627ehf_read_value (data, - data->REG_FAN_STOP_TIME[i]); +W83627EHF_REG_FAN_STOP_TIME [i]);if (data->REG_FAN_MAX_OUTPUT && data->REG_FAN_MAX_OUTPUT[i] !=0xff )
@@ -690,7 +653,7 @@ static struct w83627ehf_data *w83627ehf_update_device(struct device *dev) data->target_temp[i] =w83627ehf_read_value (data, - data->REG_TARGET[i]) & +W83627EHF_REG_TARGET [i]) & (data->pwm_mode[i] ==1 ?0x7f :0xff ); }
@@ -763,22 +726,6 @@ store_fan_min(struct device *dev, struct w83627ehf_data *data, int channel,return -EINVAL ;mutex_lock (&data->update_lock); -if (!data->has_fan_div) { -/* -* Only NCT6776F for now, so we know that this is a 13 bit -* register -*/ -if (!val) { - val =0xff1f ; - }else { -if (val >1350000U ) - val =135000U ; - val =1350000U / val; - val = (val &0x1f ) | ((val <<3 ) &0xff00 ); - } - data->fan_min[channel] = val; - goto done;/* Leave fan divider alone */ - }if (!val) {/* No min limit, alarm disabled */ data->fan_min[channel] =255 ;
@@ -794,7 +741,7 @@ store_fan_min(struct device *dev, struct w83627ehf_data *data, int channel, new_div =7 ;/* 128 == (1 << 7) */ dev_warn (dev,"fan%u low limit %lu below minimum %u, set to minimum\n" , - channel +1 , val, data->fan_from_reg_min (254 ,7 )); + channel +1 , val,fan_from_reg8 (254 ,7 )); }else if (!reg) {/* * Speed above this value cannot possibly be represented,
@@ -804,7 +751,7 @@ store_fan_min(struct device *dev, struct w83627ehf_data *data, int channel, new_div =0 ;/* 1 == (1 << 0) */ dev_warn (dev,"fan%u low limit %lu above maximum %u, set to maximum\n" , - channel +1 , val, data->fan_from_reg_min (1 ,0 )); + channel +1 , val,fan_from_reg8 (1 ,0 )); }else {/* * Automatically pick the best divider, i.e. the one such
@@ -828,12 +775,12 @@ store_fan_min(struct device *dev, struct w83627ehf_data *data, int channel, channel +1 ,div_from_reg (data->fan_div[channel]), div_from_reg(new_div)); data->fan_div[channel] = new_div; -w83627ehf_write_fan_div_common (dev, data, channel); +w83627ehf_write_fan_div (data, channel);/* Give the chip time to sample a new speed value */ data->last_updated = jiffies; } -done: -w83627ehf_write_value (data, data->REG_FAN_MIN[channel], + +w83627ehf_write_value (data,W83627EHF_REG_FAN_MIN [channel], data->fan_min[channel]);mutex_unlock (&data->update_lock);
@@ -895,7 +842,7 @@ store_pwm(struct device *dev, struct w83627ehf_data *data, int channel,mutex_lock (&data->update_lock); data->pwm[channel] = val; -w83627ehf_write_value (data, data->REG_PWM[channel], val); +w83627ehf_write_value (data,W83627EHF_REG_PWM [channel], val);mutex_unlock (&data->update_lock);return 0 ; }
@@ -954,7 +901,7 @@ store_target_temp(struct device *dev, struct device_attribute *attr,mutex_lock (&data->update_lock); data->target_temp[nr] = val; -w83627ehf_write_value (data, data->REG_TARGET[nr], val); +w83627ehf_write_value (data,W83627EHF_REG_TARGET [nr], val);mutex_unlock (&data->update_lock);return count; }
@@ -1035,15 +982,15 @@ store_##reg(struct device *dev, struct device_attribute *attr, \ val =clamp_val (val,1 ,255 ); \mutex_lock (&data->update_lock); \ data->reg[nr] = val; \ - w83627ehf_write_value(data, data->REG_##REG[nr], val); \ +w83627ehf_write_value (data,REG [nr], val); \mutex_unlock (&data->update_lock); \return count; \ } -fan_functions(fan_start_output, FAN_START_OUTPUT) -fan_functions(fan_stop_output, FAN_STOP_OUTPUT) -fan_functions(fan_max_output, FAN_MAX_OUTPUT) -fan_functions(fan_step_output, FAN_STEP_OUTPUT) +fan_functions(fan_start_output, W83627EHF_REG_FAN_START_OUTPUT) +fan_functions(fan_stop_output, W83627EHF_REG_FAN_STOP_OUTPUT) +fan_functions(fan_max_output, data->REG_FAN_MAX_OUTPUT) +fan_functions(fan_step_output, data->REG_FAN_STEP_OUTPUT)#define fan_time_functions (reg,REG ) \ static ssize_t show_##reg(struct device *dev, struct device_attribute *attr, \
@@ -1074,12 +1021,12 @@ store_##reg(struct device *dev, struct device_attribute *attr, \ val =step_time_to_reg (val, data->pwm_mode[nr]); \mutex_lock (&data->update_lock); \ data->reg[nr] = val; \ - w83627ehf_write_value(data, data->REG_##REG[nr], val); \ +w83627ehf_write_value (data,REG [nr], val); \mutex_unlock (&data->update_lock); \return count; \ } \ -fan_time_functions(fan_stop_time, FAN_STOP_TIME) +fan_time_functions(fan_stop_time, W83627EHF_REG_FAN_STOP_TIME) static SENSOR_DEVICE_ATTR(pwm4_stop_time, 0644, show_fan_stop_time, store_fan_stop_time,3 );
@@ -1555,8 +1502,8 @@ w83627ehf_do_read_fan(struct w83627ehf_data *data, u32 attr, *val = data->rpm[channel];return 0 ;case hwmon_fan_min: - *val = data->fan_from_reg_min (data->fan_min[channel], - data->fan_div[channel]); + *val =fan_from_reg8 (data->fan_min[channel], + data->fan_div[channel]);return 0 ;case hwmon_fan_div: *val =div_from_reg (data->fan_div[channel]);
@@ -1781,7 +1728,6 @@ static int w83627ehf_probe(struct platform_device *pdev)mutex_init (&data->lock);mutex_init (&data->update_lock); data->name = w83627ehf_device_names[sio_data->kind]; - data->kind = sio_data->kind; data->bank =0xff ;/* Force initial bank selection */ platform_set_drvdata (pdev, data);
@@ -1916,31 +1862,11 @@ static int w83627ehf_probe(struct platform_device *pdev) }if (sio_data->kind == w83667hg_b) { - data->has_fan_div = true; - data->fan_from_reg = fan_from_reg8; - data->fan_from_reg_min = fan_from_reg8; - data->REG_PWM =W83627EHF_REG_PWM ; - data->REG_TARGET =W83627EHF_REG_TARGET ; - data->REG_FAN =W83627EHF_REG_FAN ; - data->REG_FAN_MIN =W83627EHF_REG_FAN_MIN ; - data->REG_FAN_START_OUTPUT =W83627EHF_REG_FAN_START_OUTPUT ; - data->REG_FAN_STOP_OUTPUT =W83627EHF_REG_FAN_STOP_OUTPUT ; - data->REG_FAN_STOP_TIME =W83627EHF_REG_FAN_STOP_TIME ; data->REG_FAN_MAX_OUTPUT =W83627EHF_REG_FAN_MAX_OUTPUT_W83667_B ; data->REG_FAN_STEP_OUTPUT =W83627EHF_REG_FAN_STEP_OUTPUT_W83667_B ; }else { - data->has_fan_div = true; - data->fan_from_reg = fan_from_reg8; - data->fan_from_reg_min = fan_from_reg8; - data->REG_PWM =W83627EHF_REG_PWM ; - data->REG_TARGET =W83627EHF_REG_TARGET ; - data->REG_FAN =W83627EHF_REG_FAN ; - data->REG_FAN_MIN =W83627EHF_REG_FAN_MIN ; - data->REG_FAN_START_OUTPUT =W83627EHF_REG_FAN_START_OUTPUT ; - data->REG_FAN_STOP_OUTPUT =W83627EHF_REG_FAN_STOP_OUTPUT ; - data->REG_FAN_STOP_TIME =W83627EHF_REG_FAN_STOP_TIME ; data->REG_FAN_MAX_OUTPUT =W83627EHF_REG_FAN_MAX_OUTPUT_COMMON ; data->REG_FAN_STEP_OUTPUT =
@@ -2017,10 +1943,10 @@ static int w83627ehf_probe(struct platform_device *pdev)superio_exit (sio_data->sioreg);/* Read fan clock dividers immediately */ -w83627ehf_update_fan_div_common (dev, data); +w83627ehf_update_fan_div (data);/* Read pwm data to save original values */ -w83627ehf_update_pwm_common (dev, data); +w83627ehf_update_pwm (data);for (i =0 ; i < data->pwm_num; i++) data->pwm_enable_orig[i] = data->pwm_enable[i];
@@ -2082,7 +2008,7 @@ static int w83627ehf_resume(struct device *dev)if (!(data->has_fan_min & (1 << i)))continue ; -w83627ehf_write_value (data, data->REG_FAN_MIN[i], +w83627ehf_write_value (data,W83627EHF_REG_FAN_MIN [i], data->fan_min[i]); }
Signature · 1 line
2.24.1
PATCH 3/3 hwmon: (w83627ehf) Now only one intrusion channel
In reply to Dr. David Alan GilbertThe 2nd intrusion channel was only used on the nct6776
--- drivers/hwmon/w83627ehf.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-)
drivers/hwmon/w83627ehf.c +6 -13
@@ -1091,14 +1091,12 @@ static int clear_caseopen(struct device *dev, struct w83627ehf_data *data, int channel, long val) { - u16 masks[] = { 0x80, 0x40 }; -u16 reg, mask; + const u16 mask = 0x80; +u16 reg; -if (val !=0 || channel >1 ) +if (val !=0 || channel !=0 )return -EINVAL ; - mask = masks[channel]; -mutex_lock (&data->update_lock); reg =w83627ehf_read_value (data,W83627EHF_REG_CASEOPEN_CLR );w83627ehf_write_value (data,W83627EHF_REG_CASEOPEN_CLR , reg | mask);
@@ -1418,9 +1416,7 @@ w83627ehf_is_visible(const void *drvdata, enum hwmon_sensor_types type,break ;case hwmon_intrusion: -if (channel ==0 ) -return 0644 ; -return 0 ; +return 0644 ;default :/* Shouldn't happen */ return 0 ;
@@ -1545,12 +1541,10 @@ static int w83627ehf_do_read_intrusion(struct w83627ehf_data *data, u32 attr, int channel, long *val) { - unsigned int masks[] = { 0x10, 0x40 }; - -if (attr != hwmon_intrusion_alarm || channel >1 ) + if (attr != hwmon_intrusion_alarm || channel != 0) return -EOPNOTSUPP; /* shouldn't happen */ - *val = !!(data->caseopen & masks[channel]); + *val = !!(data->caseopen &0x10 );return 0 ; }
@@ -1688,7 +1682,6 @@ static const struct hwmon_channel_info *w83627ehf_info[] = {HWMON_T_ALARM |HWMON_T_INPUT |HWMON_T_LABEL |HWMON_T_MAX | HWMON_T_MAX_HYST | HWMON_T_OFFSET | HWMON_T_TYPE),HWMON_CHANNEL_INFO (intrusion, -HWMON_INTRUSION_ALARM ,HWMON_INTRUSION_ALARM ), NULL };
Signature · 1 line
2.24.1
Guenter Roeck
maintainerQuoted 7 lines · Dr. David Alan Gilbert
Guenter pointed out that we should remove the nct677[56] from w83627ehf since there's a separate
nct6775.cdriver.It removes a quite satisfying amount of code.
Built ontop of hwmon-next
848a25f01ee.
Series applied to hwmon-next.
Thanks!
Guenter
Quoted 11 lines
Dave
Dr. David Alan Gilbert (3):
hwmon: (w83627ehf) remove nct6775 and nct6776 support
hwmon: (w83627ehf) Remove code not needed after nct677* removal
hwmon: (w83627ehf) Now only one intrusion channeldrivers/hwmon/Kconfig | 5 +- drivers/hwmon/w83627ehf.c | 624 +++++--------------------------------- 2 files changed, 74 insertions(+), 555 deletions(-)