Skip to content

pc87360 remove offset skews from

Jim Cromie lm-sensors 1 version New

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest8 of 23 patches 0 repliesNew

8 of 23 patches are in this archive. The cover letter announces 23.

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
17/23pc87360 convert temperature dev-attrdrivers/hwmon/pc87360.c+88 -840 replies
18/23pc87360 refactor SENSOR_DEVICE_ATTRinclude/linux/hwmon-sysfs.h+7 -40 replies
19/23pc87360 convert voltage dev-attrsdrivers/hwmon/pc87360.c+59 -650 replies
20/23pc87360 convert fan & pwm dev-attrsdrivers/hwmon/pc87360.c+35 -600 replies
20/23pc87360 convert temp dev-attrs from+0 -00 replies
21/23convert temp dev-attrs fromdrivers/hwmon/pc87360.c+32 -330 replies
22/23pc87360 convert thermistor dev-attrs+0 -00 replies
22/23pc87360 convert thermistordrivers/hwmon/pc87360.c+37 -320 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

Cover letter [lm-sensors] [patchset 0/23] pc87360 remove offset skews from

remove offset skews from dev-attr get-set functions, as theyre now implemented in array initialization.

$ diffstat 20-fixup-offset-skews
 pc87360.c |   76 
+++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 38 insertions(+), 38 deletions(-)

-------------- next part --------------

drivers/hwmon/pc87360.c +7 -7
diff -ruNp -X exclude-diffs lx-22/drivers/hwmon/pc87360.c lx-23/drivers/hwmon/pc87360.c
@@ -279,35 +279,35 @@ static ssize_t show_fan_input(struct dev
 {
 	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
 	struct pc87360_data *data = pc87360_update_device(dev);
-	return sprintf(buf, "%u\n", FAN_FROM_REG(data->fan[attr->index-1],
-		       FAN_DIV_FROM_REG(data->fan_status[attr->index-1])));
+	return sprintf(buf, "%u\n", FAN_FROM_REG(data->fan[attr->index],
+		       FAN_DIV_FROM_REG(data->fan_status[attr->index])));
 }
 static ssize_t show_fan_min(struct device *dev, struct device_attribute *devattr, char *buf)
 {
 	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
 	struct pc87360_data *data = pc87360_update_device(dev);
-	return sprintf(buf, "%u\n", FAN_FROM_REG(data->fan_min[attr->index-1],
-		       FAN_DIV_FROM_REG(data->fan_status[attr->index-1])));
+	return sprintf(buf, "%u\n", FAN_FROM_REG(data->fan_min[attr->index],
+		       FAN_DIV_FROM_REG(data->fan_status[attr->index])));
 }
 static ssize_t show_fan_div(struct device *dev, struct device_attribute *devattr, char *buf)
 {
 	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
 	struct pc87360_data *data = pc87360_update_device(dev);
 	return sprintf(buf, "%u\n",
-		       FAN_DIV_FROM_REG(data->fan_status[attr->index-1]));
+		       FAN_DIV_FROM_REG(data->fan_status[attr->index]));
 }
 static ssize_t show_fan_status(struct device *dev, struct device_attribute *devattr, char *buf)
 {
 	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
 	struct pc87360_data *data = pc87360_update_device(dev);
 	return sprintf(buf, "%u\n",
-		       FAN_STATUS_FROM_REG(data->fan_status[attr->index-1]));
+		       FAN_STATUS_FROM_REG(data->fan_status[attr->index]));
 }
 static ssize_t set_fan_min(struct device *dev, struct device_attribute *devattr, const char *buf,
 	size_t count)
 {
 	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
-	return _set_fan_min(dev, buf, count, attr->index-1);
+	return _set_fan_min(dev, buf, count, attr->index);
 }
 
 static struct sensor_device_attribute sda_fan_input[] @@ -341,9 +341,9 @@ static ssize_t show_pwm(struct device *d

struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr); struct pc87360_data *data = pc87360_update_device(dev);
return sprintf(buf, "%u\n",
- PWM_FROM_REG(data->pwm[attr->index-1],
+ PWM_FROM_REG(data->pwm[attr->index],
FAN_CONFIG_INVERT(data->fan_conf,
- attr->index-1)));
+ attr->index)));
}
static ssize_t set_pwm(struct device *dev, struct device_attribute *devattr, const char *buf,
size_t count)
@@ -354,10 +354,10 @@ static ssize_t set_pwm(struct device *de
long val = simple_strtol(buf, NULL, 10);

down(&data->update_lock);
- data->pwm[attr->index-1] = PWM_TO_REG(val,
- FAN_CONFIG_INVERT(data->fan_conf, attr->index-1));
- pc87360_write_value(data, LD_FAN, NO_BANK, PC87360_REG_PWM(attr->index-1),
- data->pwm[attr->index-1]);
+ data->pwm[attr->index] = PWM_TO_REG(val,
+ FAN_CONFIG_INVERT(data->fan_conf, attr->index));
+ pc87360_write_value(data, LD_FAN, NO_BANK, PC87360_REG_PWM(attr->index),
+ data->pwm[attr->index]);
up(&data->update_lock);
return count;
}
@@ -490,21 +490,21 @@ static ssize_t show_therm_input(struct d
{
struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
struct pc87360_data *data = pc87360_update_device(dev);
- return sprintf(buf, "%u\n", IN_FROM_REG(data->in[attr->index+7],
+ return sprintf(buf, "%u\n", IN_FROM_REG(data->in[attr->index+11],
data->in_vref));
}
static ssize_t show_therm_min(struct device *dev, struct device_attribute *devattr, char *buf) {
struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
struct pc87360_data *data = pc87360_update_device(dev);
- return sprintf(buf, "%u\n", IN_FROM_REG(data->in_min[attr->index+7],
+ return sprintf(buf, "%u\n", IN_FROM_REG(data->in_min[attr->index+11],
data->in_vref));
}
static ssize_t show_therm_max(struct device *dev, struct device_attribute *devattr, char *buf) {
struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
struct pc87360_data *data = pc87360_update_device(dev);
- return sprintf(buf, "%u\n", IN_FROM_REG(data->in_max[attr->index+7],
+ return sprintf(buf, "%u\n", IN_FROM_REG(data->in_max[attr->index+11],
data->in_vref));
}
static ssize_t show_therm_crit(struct device *dev, struct device_attribute *devattr, char *buf)
@@ -518,7 +518,7 @@ static ssize_t show_therm_status(struct
{
struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
struct pc87360_data *data = pc87360_update_device(dev);
- return sprintf(buf, "%u\n", data->in_status[attr->index+7]);
+ return sprintf(buf, "%u\n", data->in_status[attr->index+11]);
}
static ssize_t set_therm_min(struct device *dev, struct device_attribute *devattr, const char *buf,
size_t count)
@@ -529,9 +529,9 @@ static ssize_t set_therm_min(struct devi
long val = simple_strtol(buf, NULL, 10);

down(&data->update_lock);
- data->in_min[attr->index+7] = IN_TO_REG(val, data->in_vref);
- pc87360_write_value(data, LD_IN, attr->index+7, PC87365_REG_TEMP_MIN,
- data->in_min[attr->index+7]);
+ data->in_min[attr->index+11] = IN_TO_REG(val, data->in_vref);
+ pc87360_write_value(data, LD_IN, attr->index+11, PC87365_REG_TEMP_MIN,
+ data->in_min[attr->index+11]);
up(&data->update_lock);
return count;
}
@@ -544,9 +544,9 @@ static ssize_t set_therm_max(struct devi
long val = simple_strtol(buf, NULL, 10);

down(&data->update_lock);
- data->in_max[attr->index+7] = IN_TO_REG(val, data->in_vref);
- pc87360_write_value(data, LD_IN, attr->index+7, PC87365_REG_TEMP_MAX,
- data->in_max[attr->index+7]);
+ data->in_max[attr->index+11] = IN_TO_REG(val, data->in_vref);
+ pc87360_write_value(data, LD_IN, attr->index+11, PC87365_REG_TEMP_MAX,
+ data->in_max[attr->index+11]);
up(&data->update_lock);
return count;
}
@@ -560,7 +560,7 @@ static ssize_t set_therm_crit(struct dev

down(&data->update_lock);
data->in_crit[attr->index] = IN_TO_REG(val, data->in_vref);
- pc87360_write_value(data, LD_IN, attr->index+7, PC87365_REG_TEMP_CRIT,
+ pc87360_write_value(data, LD_IN, attr->index+11, PC87365_REG_TEMP_CRIT,
data->in_crit[attr->index]);
up(&data->update_lock);
return count;
@@ -631,31 +631,31 @@ static ssize_t show_temp_input(struct de
{
struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
struct pc87360_data *data = pc87360_update_device(dev);
- return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp[attr->index-1]));
+ return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp[attr->index]));
}
static ssize_t show_temp_min(struct device *dev, struct device_attribute *devattr, char *buf) {
struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
struct pc87360_data *data = pc87360_update_device(dev);
- return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_min[attr->index-1]));
+ return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_min[attr->index]));
}
static ssize_t show_temp_max(struct device *dev, struct device_attribute *devattr, char *buf) {
struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
struct pc87360_data *data = pc87360_update_device(dev);
- return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_max[attr->index-1]));
+ return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_max[attr->index]));
}
static ssize_t show_temp_crit(struct device *dev, struct device_attribute *devattr, char *buf) {
struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
struct pc87360_data *data = pc87360_update_device(dev);
- return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_crit[attr->index-1]));
+ return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_crit[attr->index]));
}
static ssize_t show_temp_status(struct device *dev, struct device_attribute *devattr, char *buf) {
struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
struct pc87360_data *data = pc87360_update_device(dev);
- return sprintf(buf, "%d\n", data->temp_status[attr->index-1]);
+ return sprintf(buf, "%d\n", data->temp_status[attr->index]);
}
static ssize_t set_temp_min(struct device *dev, struct device_attribute *devattr, const char *buf,
size_t count)
@@ -666,9 +666,9 @@ static ssize_t set_temp_min(struct devic
long val = simple_strtol(buf, NULL, 10);

down(&data->update_lock);
- data->temp_min[attr->index-1] = TEMP_TO_REG(val);
- pc87360_write_value(data, LD_TEMP, attr->index-1, PC87365_REG_TEMP_MIN,
- data->temp_min[attr->index-1]);
+ data->temp_min[attr->index] = TEMP_TO_REG(val);
+ pc87360_write_value(data, LD_TEMP, attr->index, PC87365_REG_TEMP_MIN,
+ data->temp_min[attr->index]);
up(&data->update_lock);
return count;
}
@@ -681,9 +681,9 @@ static ssize_t set_temp_max(struct devic
long val = simple_strtol(buf, NULL, 10);

down(&data->update_lock);
- data->temp_max[attr->index-1] = TEMP_TO_REG(val);
- pc87360_write_value(data, LD_TEMP, attr->index-1, PC87365_REG_TEMP_MAX,
- data->temp_max[attr->index-1]);
+ data->temp_max[attr->index] = TEMP_TO_REG(val);
+ pc87360_write_value(data, LD_TEMP, attr->index, PC87365_REG_TEMP_MAX,
+ data->temp_max[attr->index]);
up(&data->update_lock);
return count;
}
@@ -696,9 +696,9 @@ static ssize_t set_temp_crit(struct devi
long val = simple_strtol(buf, NULL, 10);

down(&data->update_lock);
- data->temp_crit[attr->index-1] = TEMP_TO_REG(val);
- pc87360_write_value(data, LD_TEMP, attr->index-1, PC87365_REG_TEMP_CRIT,
- data->temp_crit[attr->index-1]);
+ data->temp_crit[attr->index] = TEMP_TO_REG(val);
+ pc87360_write_value(data, LD_TEMP, attr->index, PC87365_REG_TEMP_CRIT,
+ data->temp_crit[attr->index]);
up(&data->update_lock);
return count;
}