xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hwmon: (adm1026) Whitespace cleanups

Browse Source 
Whitespace cleanups only:
* Trim trailing whitespace.
* Use tabs for indentation and alignment.
* Add missing space after commas.
* Remove extra spaces.

No functional change, binary is identical before and after this patch.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Mark M. Hoffman <mhoffman@lightlink.com>
This commit is contained in:
Jean Delvare
2007-11-29 23:46:42 +01:00
committed by Mark M. Hoffman
parent a9273cb8ee
commit cb01a2312f
1 changed files with 227 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

133
drivers/hwmon/adm1026.c
View File

@@ -49,19 +49,19 @@ static int gpio_inverted[17] = { -1, -1, -1, -1, -1, -1, -1, -1, -1,
static int gpio_normal[17] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, static int gpio_normal[17] = { -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1 }; -1, -1, -1, -1, -1, -1, -1, -1 };
static int gpio_fan[8] = { -1, -1, -1, -1, -1, -1, -1, -1 }; static int gpio_fan[8] = { -1, -1, -1, -1, -1, -1, -1, -1 };
module_param_array(gpio_input,int,NULL,0); module_param_array(gpio_input, int, NULL, 0);
MODULE_PARM_DESC(gpio_input,"List of GPIO pins (0-16) to program as inputs"); MODULE_PARM_DESC(gpio_input, "List of GPIO pins (0-16) to program as inputs");
module_param_array(gpio_output,int,NULL,0); module_param_array(gpio_output, int, NULL, 0);
MODULE_PARM_DESC(gpio_output,"List of GPIO pins (0-16) to program as " MODULE_PARM_DESC(gpio_output, "List of GPIO pins (0-16) to program as "
"outputs"); "outputs");
module_param_array(gpio_inverted,int,NULL,0); module_param_array(gpio_inverted, int, NULL, 0);
MODULE_PARM_DESC(gpio_inverted,"List of GPIO pins (0-16) to program as " MODULE_PARM_DESC(gpio_inverted, "List of GPIO pins (0-16) to program as "
"inverted"); "inverted");
module_param_array(gpio_normal,int,NULL,0); module_param_array(gpio_normal, int, NULL, 0);
MODULE_PARM_DESC(gpio_normal,"List of GPIO pins (0-16) to program as " MODULE_PARM_DESC(gpio_normal, "List of GPIO pins (0-16) to program as "
"normal/non-inverted"); "normal/non-inverted");
module_param_array(gpio_fan,int,NULL,0); module_param_array(gpio_fan, int, NULL, 0);
MODULE_PARM_DESC(gpio_fan,"List of GPIO pins (0-7) to program as fan tachs"); MODULE_PARM_DESC(gpio_fan, "List of GPIO pins (0-7) to program as fan tachs");
/* Many ADM1026 constants specified below */ /* Many ADM1026 constants specified below */
@@ -75,14 +75,17 @@ MODULE_PARM_DESC(gpio_fan,"List of GPIO pins (0-7) to program as fan tachs");
#define CFG1_DAC_AFC 0x20 #define CFG1_DAC_AFC 0x20
#define CFG1_PWM_AFC 0x40 #define CFG1_PWM_AFC 0x40
#define CFG1_RESET 0x80 #define CFG1_RESET 0x80
#define ADM1026_REG_CONFIG2 0x01 #define ADM1026_REG_CONFIG2 0x01
/* CONFIG2 controls FAN0/GPIO0 through FAN7/GPIO7 */ /* CONFIG2 controls FAN0/GPIO0 through FAN7/GPIO7 */
#define ADM1026_REG_CONFIG3 0x07 #define ADM1026_REG_CONFIG3 0x07
#define CFG3_GPIO16_ENABLE 0x01 #define CFG3_GPIO16_ENABLE 0x01
#define CFG3_CI_CLEAR 0x02 #define CFG3_CI_CLEAR 0x02
#define CFG3_VREF_250 0x04 #define CFG3_VREF_250 0x04
#define CFG3_GPIO16_DIR 0x40 #define CFG3_GPIO16_DIR 0x40
#define CFG3_GPIO16_POL 0x80 #define CFG3_GPIO16_POL 0x80
#define ADM1026_REG_E2CONFIG 0x13 #define ADM1026_REG_E2CONFIG 0x13
#define E2CFG_READ 0x01 #define E2CFG_READ 0x01
#define E2CFG_WRITE 0x02 #define E2CFG_WRITE 0x02
@@ -192,31 +195,31 @@ static int adm1026_scaling[] = { /* .001 Volts */
3330, 4995, 2250, 12000, 13875 3330, 4995, 2250, 12000, 13875
}; };
#define NEG12_OFFSET 16000 #define NEG12_OFFSET 16000
#define SCALE(val,from,to) (((val)*(to) + ((from)/2))/(from)) #define SCALE(val, from, to) (((val)*(to) + ((from)/2))/(from))
#define INS_TO_REG(n,val) (SENSORS_LIMIT(SCALE(val,adm1026_scaling[n],192),\ #define INS_TO_REG(n, val) (SENSORS_LIMIT(SCALE(val, adm1026_scaling[n], 192),\
0,255)) 0, 255))
#define INS_FROM_REG(n,val) (SCALE(val,192,adm1026_scaling[n])) #define INS_FROM_REG(n, val) (SCALE(val, 192, adm1026_scaling[n]))
/* FAN speed is measured using 22.5kHz clock and counts for 2 pulses /* FAN speed is measured using 22.5kHz clock and counts for 2 pulses
* and we assume a 2 pulse-per-rev fan tach signal * and we assume a 2 pulse-per-rev fan tach signal
* 22500 kHz * 60 (sec/min) * 2 (pulse) / 2 (pulse/rev) == 1350000 * 22500 kHz * 60 (sec/min) * 2 (pulse) / 2 (pulse/rev) == 1350000
*/ */
#define FAN_TO_REG(val,div) ((val)<=0 ? 0xff : SENSORS_LIMIT(1350000/((val)*\ #define FAN_TO_REG(val, div) ((val) <= 0 ? 0xff : \
(div)),1,254)) SENSORS_LIMIT(1350000/((val)*(div)), 1, 254))
#define FAN_FROM_REG(val,div) ((val)==0?-1:(val)==0xff ? 0 : 1350000/((val)*\ #define FAN_FROM_REG(val, div) ((val) == 0 ? -1:(val) == 0xff ? 0 : \
(div))) 1350000/((val)*(div)))
#define DIV_FROM_REG(val) (1<<(val)) #define DIV_FROM_REG(val) (1<<(val))
#define DIV_TO_REG(val) ((val)>=8 ? 3 : (val)>=4 ? 2 : (val)>=2 ? 1 : 0) #define DIV_TO_REG(val) ((val) >= 8 ? 3 : (val) >= 4 ? 2 : (val) >= 2 ? 1 : 0)
/* Temperature is reported in 1 degC increments */ /* Temperature is reported in 1 degC increments */
#define TEMP_TO_REG(val) (SENSORS_LIMIT(((val)+((val)<0 ? -500 : 500))/1000,\ #define TEMP_TO_REG(val) (SENSORS_LIMIT(((val)+((val)<0 ? -500 : 500))/1000,\
-127,127)) -127, 127))
#define TEMP_FROM_REG(val) ((val) * 1000) #define TEMP_FROM_REG(val) ((val) * 1000)
#define OFFSET_TO_REG(val) (SENSORS_LIMIT(((val)+((val)<0 ? -500 : 500))/1000,\ #define OFFSET_TO_REG(val) (SENSORS_LIMIT(((val)+((val)<0 ? -500 : 500))/1000,\
-127,127)) -127, 127))
#define OFFSET_FROM_REG(val) ((val) * 1000) #define OFFSET_FROM_REG(val) ((val) * 1000)
#define PWM_TO_REG(val) (SENSORS_LIMIT(val,0,255)) #define PWM_TO_REG(val) (SENSORS_LIMIT(val, 0, 255))
#define PWM_FROM_REG(val) (val) #define PWM_FROM_REG(val) (val)
#define PWM_MIN_TO_REG(val) ((val) & 0xf0) #define PWM_MIN_TO_REG(val) ((val) & 0xf0)
@@ -226,7 +229,7 @@ static int adm1026_scaling[] = { /* .001 Volts */
* indicates that the DAC could be used to drive the fans, but in our * indicates that the DAC could be used to drive the fans, but in our
* example board (Arima HDAMA) it isn't connected to the fans at all. * example board (Arima HDAMA) it isn't connected to the fans at all.
*/ */
#define DAC_TO_REG(val) (SENSORS_LIMIT(((((val)*255)+500)/2500),0,255)) #define DAC_TO_REG(val) (SENSORS_LIMIT(((((val)*255)+500)/2500), 0, 255))
#define DAC_FROM_REG(val) (((val)*2500)/255) #define DAC_FROM_REG(val) (((val)*2500)/255)
/* Typically used with systems using a v9.1 VRM spec ? */ /* Typically used with systems using a v9.1 VRM spec ? */
@@ -569,7 +572,7 @@ static struct adm1026_data *adm1026_update_device(struct device *dev)
if (!data->valid if (!data->valid
|| time_after(jiffies, data->last_reading + ADM1026_DATA_INTERVAL)) { || time_after(jiffies, data->last_reading + ADM1026_DATA_INTERVAL)) {
/* Things that change quickly */ /* Things that change quickly */
dev_dbg(&client->dev,"Reading sensor values\n"); dev_dbg(&client->dev, "Reading sensor values\n");
for (i = 0;i <= 16;++i) { for (i = 0;i <= 16;++i) {
data->in[i] = data->in[i] =
adm1026_read_value(client, ADM1026_REG_IN[i]); adm1026_read_value(client, ADM1026_REG_IN[i]);
@@ -710,7 +713,7 @@ static ssize_t show_in(struct device *dev, struct device_attribute *attr,
struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr); struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
int nr = sensor_attr->index; int nr = sensor_attr->index;
struct adm1026_data *data = adm1026_update_device(dev); struct adm1026_data *data = adm1026_update_device(dev);
return sprintf(buf,"%d\n", INS_FROM_REG(nr, data->in[nr])); return sprintf(buf, "%d\n", INS_FROM_REG(nr, data->in[nr]));
} }
static ssize_t show_in_min(struct device *dev, struct device_attribute *attr, static ssize_t show_in_min(struct device *dev, struct device_attribute *attr,
char *buf) char *buf)
@@ -718,7 +721,7 @@ static ssize_t show_in_min(struct device *dev, struct device_attribute *attr,
struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr); struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
int nr = sensor_attr->index; int nr = sensor_attr->index;
struct adm1026_data *data = adm1026_update_device(dev); struct adm1026_data *data = adm1026_update_device(dev);
return sprintf(buf,"%d\n", INS_FROM_REG(nr, data->in_min[nr])); return sprintf(buf, "%d\n", INS_FROM_REG(nr, data->in_min[nr]));
} }
static ssize_t set_in_min(struct device *dev, struct device_attribute *attr, static ssize_t set_in_min(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count) const char *buf, size_t count)
@@ -741,7 +744,7 @@ static ssize_t show_in_max(struct device *dev, struct device_attribute *attr,
struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr); struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
int nr = sensor_attr->index; int nr = sensor_attr->index;
struct adm1026_data *data = adm1026_update_device(dev); struct adm1026_data *data = adm1026_update_device(dev);
return sprintf(buf,"%d\n", INS_FROM_REG(nr, data->in_max[nr])); return sprintf(buf, "%d\n", INS_FROM_REG(nr, data->in_max[nr]));
} }
static ssize_t set_in_max(struct device *dev, struct device_attribute *attr, static ssize_t set_in_max(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count) const char *buf, size_t count)
@@ -788,13 +791,13 @@ in_reg(15);
static ssize_t show_in16(struct device *dev, struct device_attribute *attr, char *buf) static ssize_t show_in16(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct adm1026_data *data = adm1026_update_device(dev); struct adm1026_data *data = adm1026_update_device(dev);
return sprintf(buf,"%d\n", INS_FROM_REG(16, data->in[16]) - return sprintf(buf, "%d\n", INS_FROM_REG(16, data->in[16]) -
NEG12_OFFSET); NEG12_OFFSET);
} }
static ssize_t show_in16_min(struct device *dev, struct device_attribute *attr, char *buf) static ssize_t show_in16_min(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct adm1026_data *data = adm1026_update_device(dev); struct adm1026_data *data = adm1026_update_device(dev);
return sprintf(buf,"%d\n", INS_FROM_REG(16, data->in_min[16]) return sprintf(buf, "%d\n", INS_FROM_REG(16, data->in_min[16])
- NEG12_OFFSET); - NEG12_OFFSET);
} }
static ssize_t set_in16_min(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) static ssize_t set_in16_min(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
@@ -812,7 +815,7 @@ static ssize_t set_in16_min(struct device *dev, struct device_attribute *attr, c
static ssize_t show_in16_max(struct device *dev, struct device_attribute *attr, char *buf) static ssize_t show_in16_max(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct adm1026_data *data = adm1026_update_device(dev); struct adm1026_data *data = adm1026_update_device(dev);
return sprintf(buf,"%d\n", INS_FROM_REG(16, data->in_max[16]) return sprintf(buf, "%d\n", INS_FROM_REG(16, data->in_max[16])
- NEG12_OFFSET); - NEG12_OFFSET);
} }
static ssize_t set_in16_max(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) static ssize_t set_in16_max(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
@@ -843,7 +846,7 @@ static ssize_t show_fan(struct device *dev, struct device_attribute *attr,
struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr); struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
int nr = sensor_attr->index; int nr = sensor_attr->index;
struct adm1026_data *data = adm1026_update_device(dev); struct adm1026_data *data = adm1026_update_device(dev);
return sprintf(buf,"%d\n", FAN_FROM_REG(data->fan[nr], return sprintf(buf, "%d\n", FAN_FROM_REG(data->fan[nr],
data->fan_div[nr])); data->fan_div[nr]));
} }
static ssize_t show_fan_min(struct device *dev, struct device_attribute *attr, static ssize_t show_fan_min(struct device *dev, struct device_attribute *attr,
@@ -852,7 +855,7 @@ static ssize_t show_fan_min(struct device *dev, struct device_attribute *attr,
struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr); struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
int nr = sensor_attr->index; int nr = sensor_attr->index;
struct adm1026_data *data = adm1026_update_device(dev); struct adm1026_data *data = adm1026_update_device(dev);
return sprintf(buf,"%d\n", FAN_FROM_REG(data->fan_min[nr], return sprintf(buf, "%d\n", FAN_FROM_REG(data->fan_min[nr],
data->fan_div[nr])); data->fan_div[nr]));
} }
static ssize_t set_fan_min(struct device *dev, struct device_attribute *attr, static ssize_t set_fan_min(struct device *dev, struct device_attribute *attr,
@@ -913,7 +916,7 @@ static ssize_t show_fan_div(struct device *dev, struct device_attribute *attr,
struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr); struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
int nr = sensor_attr->index; int nr = sensor_attr->index;
struct adm1026_data *data = adm1026_update_device(dev); struct adm1026_data *data = adm1026_update_device(dev);
return sprintf(buf,"%d\n", data->fan_div[nr]); return sprintf(buf, "%d\n", data->fan_div[nr]);
} }
static ssize_t set_fan_div(struct device *dev, struct device_attribute *attr, static ssize_t set_fan_div(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count) const char *buf, size_t count)
@@ -922,7 +925,7 @@ static ssize_t set_fan_div(struct device *dev, struct device_attribute *attr,
int nr = sensor_attr->index; int nr = sensor_attr->index;
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
struct adm1026_data *data = i2c_get_clientdata(client); struct adm1026_data *data = i2c_get_clientdata(client);
int val,orig_div,new_div,shift; int val, orig_div, new_div, shift;
val = simple_strtol(buf, NULL, 10); val = simple_strtol(buf, NULL, 10);
new_div = DIV_TO_REG(val); new_div = DIV_TO_REG(val);
@@ -946,7 +949,7 @@ static ssize_t set_fan_div(struct device *dev, struct device_attribute *attr,
} }
if (data->fan_div[nr] != orig_div) { if (data->fan_div[nr] != orig_div) {
fixup_fan_min(dev,nr,orig_div); fixup_fan_min(dev, nr, orig_div);
} }
mutex_unlock(&data->update_lock); mutex_unlock(&data->update_lock);
return count; return count;
@@ -972,7 +975,7 @@ static ssize_t show_temp(struct device *dev, struct device_attribute *attr,
struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr); struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
int nr = sensor_attr->index; int nr = sensor_attr->index;
struct adm1026_data *data = adm1026_update_device(dev); struct adm1026_data *data = adm1026_update_device(dev);
return sprintf(buf,"%d\n", TEMP_FROM_REG(data->temp[nr])); return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp[nr]));
} }
static ssize_t show_temp_min(struct device *dev, struct device_attribute *attr, static ssize_t show_temp_min(struct device *dev, struct device_attribute *attr,
char *buf) char *buf)
@@ -980,7 +983,7 @@ static ssize_t show_temp_min(struct device *dev, struct device_attribute *attr,
struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr); struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
int nr = sensor_attr->index; int nr = sensor_attr->index;
struct adm1026_data *data = adm1026_update_device(dev); struct adm1026_data *data = adm1026_update_device(dev);
return sprintf(buf,"%d\n", TEMP_FROM_REG(data->temp_min[nr])); return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_min[nr]));
} }
static ssize_t set_temp_min(struct device *dev, struct device_attribute *attr, static ssize_t set_temp_min(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count) const char *buf, size_t count)
@@ -1004,7 +1007,7 @@ static ssize_t show_temp_max(struct device *dev, struct device_attribute *attr,
struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr); struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
int nr = sensor_attr->index; int nr = sensor_attr->index;
struct adm1026_data *data = adm1026_update_device(dev); struct adm1026_data *data = adm1026_update_device(dev);
return sprintf(buf,"%d\n", TEMP_FROM_REG(data->temp_max[nr])); return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_max[nr]));
} }
static ssize_t set_temp_max(struct device *dev, struct device_attribute *attr, static ssize_t set_temp_max(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count) const char *buf, size_t count)
@@ -1042,7 +1045,7 @@ static ssize_t show_temp_offset(struct device *dev,
struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr); struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
int nr = sensor_attr->index; int nr = sensor_attr->index;
struct adm1026_data *data = adm1026_update_device(dev); struct adm1026_data *data = adm1026_update_device(dev);
return sprintf(buf,"%d\n", TEMP_FROM_REG(data->temp_offset[nr])); return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_offset[nr]));
} }
static ssize_t set_temp_offset(struct device *dev, static ssize_t set_temp_offset(struct device *dev,
struct device_attribute *attr, const char *buf, struct device_attribute *attr, const char *buf,
@@ -1076,7 +1079,7 @@ static ssize_t show_temp_auto_point1_temp_hyst(struct device *dev,
struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr); struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
int nr = sensor_attr->index; int nr = sensor_attr->index;
struct adm1026_data *data = adm1026_update_device(dev); struct adm1026_data *data = adm1026_update_device(dev);
return sprintf(buf,"%d\n", TEMP_FROM_REG( return sprintf(buf, "%d\n", TEMP_FROM_REG(
ADM1026_FAN_ACTIVATION_TEMP_HYST + data->temp_tmin[nr])); ADM1026_FAN_ACTIVATION_TEMP_HYST + data->temp_tmin[nr]));
} }
static ssize_t show_temp_auto_point2_temp(struct device *dev, static ssize_t show_temp_auto_point2_temp(struct device *dev,
@@ -1085,7 +1088,7 @@ static ssize_t show_temp_auto_point2_temp(struct device *dev,
struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr); struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
int nr = sensor_attr->index; int nr = sensor_attr->index;
struct adm1026_data *data = adm1026_update_device(dev); struct adm1026_data *data = adm1026_update_device(dev);
return sprintf(buf,"%d\n", TEMP_FROM_REG(data->temp_tmin[nr] + return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_tmin[nr] +
ADM1026_FAN_CONTROL_TEMP_RANGE)); ADM1026_FAN_CONTROL_TEMP_RANGE));
} }
static ssize_t show_temp_auto_point1_temp(struct device *dev, static ssize_t show_temp_auto_point1_temp(struct device *dev,
@@ -1094,7 +1097,7 @@ static ssize_t show_temp_auto_point1_temp(struct device *dev,
struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr); struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
int nr = sensor_attr->index; int nr = sensor_attr->index;
struct adm1026_data *data = adm1026_update_device(dev); struct adm1026_data *data = adm1026_update_device(dev);
return sprintf(buf,"%d\n", TEMP_FROM_REG(data->temp_tmin[nr])); return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_tmin[nr]));
} }
static ssize_t set_temp_auto_point1_temp(struct device *dev, static ssize_t set_temp_auto_point1_temp(struct device *dev,
struct device_attribute *attr, const char *buf, size_t count) struct device_attribute *attr, const char *buf, size_t count)
@@ -1114,10 +1117,10 @@ static ssize_t set_temp_auto_point1_temp(struct device *dev,
} }
#define temp_auto_point(offset) \ #define temp_auto_point(offset) \
static SENSOR_DEVICE_ATTR(temp##offset##_auto_point1_temp, S_IRUGO | S_IWUSR, \ static SENSOR_DEVICE_ATTR(temp##offset##_auto_point1_temp, \
show_temp_auto_point1_temp, set_temp_auto_point1_temp, \ S_IRUGO | S_IWUSR, show_temp_auto_point1_temp, \
offset - 1); \ set_temp_auto_point1_temp, offset - 1); \
static SENSOR_DEVICE_ATTR(temp##offset##_auto_point1_temp_hyst, S_IRUGO, \ static SENSOR_DEVICE_ATTR(temp##offset##_auto_point1_temp_hyst, S_IRUGO,\
show_temp_auto_point1_temp_hyst, NULL, offset - 1); \ show_temp_auto_point1_temp_hyst, NULL, offset - 1); \
static SENSOR_DEVICE_ATTR(temp##offset##_auto_point2_temp, S_IRUGO, \ static SENSOR_DEVICE_ATTR(temp##offset##_auto_point2_temp, S_IRUGO, \
show_temp_auto_point2_temp, NULL, offset - 1); show_temp_auto_point2_temp, NULL, offset - 1);
@@ -1130,7 +1133,7 @@ static ssize_t show_temp_crit_enable(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
struct adm1026_data *data = adm1026_update_device(dev); struct adm1026_data *data = adm1026_update_device(dev);
return sprintf(buf,"%d\n", (data->config1 & CFG1_THERM_HOT) >> 4); return sprintf(buf, "%d\n", (data->config1 & CFG1_THERM_HOT) >> 4);
} }
static ssize_t set_temp_crit_enable(struct device *dev, static ssize_t set_temp_crit_enable(struct device *dev,
struct device_attribute *attr, const char *buf, size_t count) struct device_attribute *attr, const char *buf, size_t count)
@@ -1163,7 +1166,7 @@ static ssize_t show_temp_crit(struct device *dev,
struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr); struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
int nr = sensor_attr->index; int nr = sensor_attr->index;
struct adm1026_data *data = adm1026_update_device(dev); struct adm1026_data *data = adm1026_update_device(dev);
return sprintf(buf,"%d\n", TEMP_FROM_REG(data->temp_crit[nr])); return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_crit[nr]));
} }
static ssize_t set_temp_crit(struct device *dev, struct device_attribute *attr, static ssize_t set_temp_crit(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count) const char *buf, size_t count)
@@ -1193,7 +1196,7 @@ temp_crit_reg(3);
static ssize_t show_analog_out_reg(struct device *dev, struct device_attribute *attr, char *buf) static ssize_t show_analog_out_reg(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct adm1026_data *data = adm1026_update_device(dev); struct adm1026_data *data = adm1026_update_device(dev);
return sprintf(buf,"%d\n", DAC_FROM_REG(data->analog_out)); return sprintf(buf, "%d\n", DAC_FROM_REG(data->analog_out));
} }
static ssize_t set_analog_out_reg(struct device *dev, struct device_attribute *attr, const char *buf, static ssize_t set_analog_out_reg(struct device *dev, struct device_attribute *attr, const char *buf,
size_t count) size_t count)
@@ -1215,14 +1218,14 @@ static DEVICE_ATTR(analog_out, S_IRUGO | S_IWUSR, show_analog_out_reg,
static ssize_t show_vid_reg(struct device *dev, struct device_attribute *attr, char *buf) static ssize_t show_vid_reg(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct adm1026_data *data = adm1026_update_device(dev); struct adm1026_data *data = adm1026_update_device(dev);
return sprintf(buf,"%d\n", vid_from_reg(data->vid & 0x3f, data->vrm)); return sprintf(buf, "%d\n", vid_from_reg(data->vid & 0x3f, data->vrm));
} }
static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid_reg, NULL); static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid_reg, NULL);
static ssize_t show_vrm_reg(struct device *dev, struct device_attribute *attr, char *buf) static ssize_t show_vrm_reg(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct adm1026_data *data = dev_get_drvdata(dev); struct adm1026_data *data = dev_get_drvdata(dev);
return sprintf(buf,"%d\n", data->vrm); return sprintf(buf, "%d\n", data->vrm);
} }
static ssize_t store_vrm_reg(struct device *dev, struct device_attribute *attr, const char *buf, static ssize_t store_vrm_reg(struct device *dev, struct device_attribute *attr, const char *buf,
size_t count) size_t count)
@@ -1284,7 +1287,7 @@ static SENSOR_DEVICE_ATTR(in8_alarm, S_IRUGO, show_alarm, NULL, 26);
static ssize_t show_alarm_mask(struct device *dev, struct device_attribute *attr, char *buf) static ssize_t show_alarm_mask(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct adm1026_data *data = adm1026_update_device(dev); struct adm1026_data *data = adm1026_update_device(dev);
return sprintf(buf,"%ld\n", data->alarm_mask); return sprintf(buf, "%ld\n", data->alarm_mask);
} }
static ssize_t set_alarm_mask(struct device *dev, struct device_attribute *attr, const char *buf, static ssize_t set_alarm_mask(struct device *dev, struct device_attribute *attr, const char *buf,
size_t count) size_t count)
@@ -1320,7 +1323,7 @@ static DEVICE_ATTR(alarm_mask, S_IRUGO | S_IWUSR, show_alarm_mask,
static ssize_t show_gpio(struct device *dev, struct device_attribute *attr, char *buf) static ssize_t show_gpio(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct adm1026_data *data = adm1026_update_device(dev); struct adm1026_data *data = adm1026_update_device(dev);
return sprintf(buf,"%ld\n", data->gpio); return sprintf(buf, "%ld\n", data->gpio);
} }
static ssize_t set_gpio(struct device *dev, struct device_attribute *attr, const char *buf, static ssize_t set_gpio(struct device *dev, struct device_attribute *attr, const char *buf,
size_t count) size_t count)
@@ -1333,11 +1336,11 @@ static ssize_t set_gpio(struct device *dev, struct device_attribute *attr, const
mutex_lock(&data->update_lock); mutex_lock(&data->update_lock);
data->gpio = val & 0x1ffff; data->gpio = val & 0x1ffff;
gpio = data->gpio; gpio = data->gpio;
adm1026_write_value(client, ADM1026_REG_GPIO_STATUS_0_7,gpio & 0xff); adm1026_write_value(client, ADM1026_REG_GPIO_STATUS_0_7, gpio & 0xff);
gpio >>= 8; gpio >>= 8;
adm1026_write_value(client, ADM1026_REG_GPIO_STATUS_8_15,gpio & 0xff); adm1026_write_value(client, ADM1026_REG_GPIO_STATUS_8_15, gpio & 0xff);
gpio = ((gpio >> 1) & 0x80) | (data->alarms >> 24 & 0x7f); gpio = ((gpio >> 1) & 0x80) | (data->alarms >> 24 & 0x7f);
adm1026_write_value(client, ADM1026_REG_STATUS4,gpio & 0xff); adm1026_write_value(client, ADM1026_REG_STATUS4, gpio & 0xff);
mutex_unlock(&data->update_lock); mutex_unlock(&data->update_lock);
return count; return count;
} }
@@ -1348,7 +1351,7 @@ static DEVICE_ATTR(gpio, S_IRUGO | S_IWUSR, show_gpio, set_gpio);
static ssize_t show_gpio_mask(struct device *dev, struct device_attribute *attr, char *buf) static ssize_t show_gpio_mask(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct adm1026_data *data = adm1026_update_device(dev); struct adm1026_data *data = adm1026_update_device(dev);
return sprintf(buf,"%ld\n", data->gpio_mask); return sprintf(buf, "%ld\n", data->gpio_mask);
} }
static ssize_t set_gpio_mask(struct device *dev, struct device_attribute *attr, const char *buf, static ssize_t set_gpio_mask(struct device *dev, struct device_attribute *attr, const char *buf,
size_t count) size_t count)
@@ -1361,11 +1364,11 @@ static ssize_t set_gpio_mask(struct device *dev, struct device_attribute *attr,
mutex_lock(&data->update_lock); mutex_lock(&data->update_lock);
data->gpio_mask = val & 0x1ffff; data->gpio_mask = val & 0x1ffff;
mask = data->gpio_mask; mask = data->gpio_mask;
adm1026_write_value(client, ADM1026_REG_GPIO_MASK_0_7,mask & 0xff); adm1026_write_value(client, ADM1026_REG_GPIO_MASK_0_7, mask & 0xff);
mask >>= 8; mask >>= 8;
adm1026_write_value(client, ADM1026_REG_GPIO_MASK_8_15,mask & 0xff); adm1026_write_value(client, ADM1026_REG_GPIO_MASK_8_15, mask & 0xff);
mask = ((mask >> 1) & 0x80) | (data->alarm_mask >> 24 & 0x7f); mask = ((mask >> 1) & 0x80) | (data->alarm_mask >> 24 & 0x7f);
adm1026_write_value(client, ADM1026_REG_MASK1,mask & 0xff); adm1026_write_value(client, ADM1026_REG_MASK1, mask & 0xff);
mutex_unlock(&data->update_lock); mutex_unlock(&data->update_lock);
return count; return count;
} }
@@ -1375,7 +1378,7 @@ static DEVICE_ATTR(gpio_mask, S_IRUGO | S_IWUSR, show_gpio_mask, set_gpio_mask);
static ssize_t show_pwm_reg(struct device *dev, struct device_attribute *attr, char *buf) static ssize_t show_pwm_reg(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct adm1026_data *data = adm1026_update_device(dev); struct adm1026_data *data = adm1026_update_device(dev);
return sprintf(buf,"%d\n", PWM_FROM_REG(data->pwm1.pwm)); return sprintf(buf, "%d\n", PWM_FROM_REG(data->pwm1.pwm));
} }
static ssize_t set_pwm_reg(struct device *dev, struct device_attribute *attr, const char *buf, static ssize_t set_pwm_reg(struct device *dev, struct device_attribute *attr, const char *buf,
size_t count) size_t count)
@@ -1396,7 +1399,7 @@ static ssize_t set_pwm_reg(struct device *dev, struct device_attribute *attr, co
static ssize_t show_auto_pwm_min(struct device *dev, struct device_attribute *attr, char *buf) static ssize_t show_auto_pwm_min(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct adm1026_data *data = adm1026_update_device(dev); struct adm1026_data *data = adm1026_update_device(dev);
return sprintf(buf,"%d\n", data->pwm1.auto_pwm_min); return sprintf(buf, "%d\n", data->pwm1.auto_pwm_min);
} }
static ssize_t set_auto_pwm_min(struct device *dev, struct device_attribute *attr, const char *buf, static ssize_t set_auto_pwm_min(struct device *dev, struct device_attribute *attr, const char *buf,
size_t count) size_t count)
@@ -1406,7 +1409,7 @@ static ssize_t set_auto_pwm_min(struct device *dev, struct device_attribute *att
int val = simple_strtol(buf, NULL, 10); int val = simple_strtol(buf, NULL, 10);
mutex_lock(&data->update_lock); mutex_lock(&data->update_lock);
data->pwm1.auto_pwm_min = SENSORS_LIMIT(val,0,255); data->pwm1.auto_pwm_min = SENSORS_LIMIT(val, 0, 255);
if (data->pwm1.enable == 2) { /* apply immediately */ if (data->pwm1.enable == 2) { /* apply immediately */
data->pwm1.pwm = PWM_TO_REG((data->pwm1.pwm & 0x0f) | data->pwm1.pwm = PWM_TO_REG((data->pwm1.pwm & 0x0f) |
PWM_MIN_TO_REG(data->pwm1.auto_pwm_min)); PWM_MIN_TO_REG(data->pwm1.auto_pwm_min));
@@ -1417,12 +1420,12 @@ static ssize_t set_auto_pwm_min(struct device *dev, struct device_attribute *att
} }
static ssize_t show_auto_pwm_max(struct device *dev, struct device_attribute *attr, char *buf) static ssize_t show_auto_pwm_max(struct device *dev, struct device_attribute *attr, char *buf)
{ {
return sprintf(buf,"%d\n", ADM1026_PWM_MAX); return sprintf(buf, "%d\n", ADM1026_PWM_MAX);
} }
static ssize_t show_pwm_enable(struct device *dev, struct device_attribute *attr, char *buf) static ssize_t show_pwm_enable(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct adm1026_data *data = adm1026_update_device(dev); struct adm1026_data *data = adm1026_update_device(dev);
return sprintf(buf,"%d\n", data->pwm1.enable); return sprintf(buf, "%d\n", data->pwm1.enable);
} }
static ssize_t set_pwm_enable(struct device *dev, struct device_attribute *attr, const char *buf, static ssize_t set_pwm_enable(struct device *dev, struct device_attribute *attr, const char *buf,
size_t count) size_t count)