mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-18 17:54:13 +08:00
hwmon: (w83627ehf) Fixed most checkpatch warnings and errors
This cleanup fixes most of the checkpatch warnings and errors in the w83627ehf driver. Remaining warnings and errors are left untouched on purpose to avoid making the code less readable. Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com> Acked-by: Ian Dobson <i.dobson@planet-ian.com>
This commit is contained in:
Guenter Roeck
parent
bce26c58df
commit
e7e1ca6ef4
@ -61,7 +61,7 @@
|
||||
enum kinds { w83627ehf, w83627dhg, w83627dhg_p, w83667hg, w83667hg_b };
|
||||
|
||||
/* used to set data->name = w83627ehf_device_names[data->sio_kind] */
|
||||
static const char * w83627ehf_device_names[] = {
|
||||
static const char * const w83627ehf_device_names[] = {
|
||||
"w83627ehf",
|
||||
"w83627dhg",
|
||||
"w83627dhg",
|
||||
@ -138,7 +138,7 @@ superio_exit(int ioreg)
|
||||
* ISA constants
|
||||
*/
|
||||
|
||||
#define IOREGION_ALIGNMENT ~7
|
||||
#define IOREGION_ALIGNMENT (~7)
|
||||
#define IOREGION_OFFSET 5
|
||||
#define IOREGION_LENGTH 2
|
||||
#define ADDR_REG_OFFSET 0
|
||||
@ -279,7 +279,8 @@ static inline long in_from_reg(u8 reg, u8 nr)
|
||||
|
||||
static inline u8 in_to_reg(u32 val, u8 nr)
|
||||
{
|
||||
return SENSORS_LIMIT(((val + (scale_in[nr] / 2)) / scale_in[nr]), 0, 255);
|
||||
return SENSORS_LIMIT(((val + (scale_in[nr] / 2)) / scale_in[nr]), 0,
|
||||
255);
|
||||
}
|
||||
|
||||
/*
|
||||
@ -321,7 +322,8 @@ struct w83627ehf_data {
|
||||
u8 pwm_enable[4]; /* 1->manual
|
||||
2->thermal cruise mode (also called SmartFan I)
|
||||
3->fan speed cruise mode
|
||||
4->variable thermal cruise (also called SmartFan III) */
|
||||
4->variable thermal cruise (also called
|
||||
SmartFan III) */
|
||||
u8 pwm_num; /* number of pwm */
|
||||
u8 pwm[4];
|
||||
u8 target_temp[4];
|
||||
@ -384,7 +386,8 @@ static u16 w83627ehf_read_value(struct w83627ehf_data *data, u16 reg)
|
||||
return res;
|
||||
}
|
||||
|
||||
static int w83627ehf_write_value(struct w83627ehf_data *data, u16 reg, u16 value)
|
||||
static int w83627ehf_write_value(struct w83627ehf_data *data, u16 reg,
|
||||
u16 value)
|
||||
{
|
||||
int word_sized = is_word_sized(reg);
|
||||
|
||||
@ -611,7 +614,8 @@ show_##reg(struct device *dev, struct device_attribute *attr, \
|
||||
char *buf) \
|
||||
{ \
|
||||
struct w83627ehf_data *data = w83627ehf_update_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; \
|
||||
return sprintf(buf, "%ld\n", in_from_reg(data->reg[nr], nr)); \
|
||||
}
|
||||
@ -621,11 +625,12 @@ show_in_reg(in_max)
|
||||
|
||||
#define store_in_reg(REG, reg) \
|
||||
static ssize_t \
|
||||
store_in_##reg (struct device *dev, struct device_attribute *attr, \
|
||||
store_in_##reg(struct device *dev, struct device_attribute *attr, \
|
||||
const char *buf, size_t count) \
|
||||
{ \
|
||||
struct w83627ehf_data *data = dev_get_drvdata(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; \
|
||||
unsigned long val; \
|
||||
int err; \
|
||||
@ -643,7 +648,8 @@ store_in_##reg (struct device *dev, struct device_attribute *attr, \
|
||||
store_in_reg(MIN, min)
|
||||
store_in_reg(MAX, max)
|
||||
|
||||
static ssize_t show_alarm(struct device *dev, struct device_attribute *attr, char *buf)
|
||||
static ssize_t show_alarm(struct device *dev, struct device_attribute *attr,
|
||||
char *buf)
|
||||
{
|
||||
struct w83627ehf_data *data = w83627ehf_update_device(dev);
|
||||
struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
|
||||
@ -709,7 +715,8 @@ show_##reg(struct device *dev, struct device_attribute *attr, \
|
||||
char *buf) \
|
||||
{ \
|
||||
struct w83627ehf_data *data = w83627ehf_update_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; \
|
||||
return sprintf(buf, "%d\n", \
|
||||
fan_from_reg(data->reg[nr], \
|
||||
@ -847,7 +854,8 @@ show_##reg(struct device *dev, struct device_attribute *attr, \
|
||||
char *buf) \
|
||||
{ \
|
||||
struct w83627ehf_data *data = w83627ehf_update_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; \
|
||||
return sprintf(buf, "%d\n", \
|
||||
temp_from_reg(W83627EHF_REG_##REG[nr], data->reg[nr])); \
|
||||
@ -862,7 +870,8 @@ store_##reg(struct device *dev, struct device_attribute *attr, \
|
||||
const char *buf, size_t count) \
|
||||
{ \
|
||||
struct w83627ehf_data *data = dev_get_drvdata(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 err; \
|
||||
long val; \
|
||||
@ -925,11 +934,12 @@ static struct sensor_device_attribute sda_temp_type[] = {
|
||||
};
|
||||
|
||||
#define show_pwm_reg(reg) \
|
||||
static ssize_t show_##reg (struct device *dev, struct device_attribute *attr, \
|
||||
static ssize_t show_##reg(struct device *dev, struct device_attribute *attr, \
|
||||
char *buf) \
|
||||
{ \
|
||||
struct w83627ehf_data *data = w83627ehf_update_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; \
|
||||
return sprintf(buf, "%d\n", data->reg[nr]); \
|
||||
}
|
||||
@ -1022,7 +1032,8 @@ static ssize_t show_##reg(struct device *dev, struct device_attribute *attr, \
|
||||
char *buf) \
|
||||
{ \
|
||||
struct w83627ehf_data *data = w83627ehf_update_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; \
|
||||
return sprintf(buf, "%d\n", data->reg[nr] * 1000); \
|
||||
}
|
||||
@ -1141,16 +1152,18 @@ static ssize_t show_##reg(struct device *dev, struct device_attribute *attr, \
|
||||
char *buf) \
|
||||
{ \
|
||||
struct w83627ehf_data *data = w83627ehf_update_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; \
|
||||
return sprintf(buf, "%d\n", data->reg[nr]); \
|
||||
}\
|
||||
} \
|
||||
static ssize_t \
|
||||
store_##reg(struct device *dev, struct device_attribute *attr, \
|
||||
const char *buf, size_t count) \
|
||||
{\
|
||||
{ \
|
||||
struct w83627ehf_data *data = dev_get_drvdata(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; \
|
||||
unsigned long val; \
|
||||
int err; \
|
||||
@ -1175,10 +1188,12 @@ static ssize_t show_##reg(struct device *dev, struct device_attribute *attr, \
|
||||
char *buf) \
|
||||
{ \
|
||||
struct w83627ehf_data *data = w83627ehf_update_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; \
|
||||
return sprintf(buf, "%d\n", \
|
||||
step_time_from_reg(data->reg[nr], data->pwm_mode[nr])); \
|
||||
step_time_from_reg(data->reg[nr], \
|
||||
data->pwm_mode[nr])); \
|
||||
} \
|
||||
\
|
||||
static ssize_t \
|
||||
@ -1186,7 +1201,8 @@ store_##reg(struct device *dev, struct device_attribute *attr, \
|
||||
const char *buf, size_t count) \
|
||||
{ \
|
||||
struct w83627ehf_data *data = dev_get_drvdata(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; \
|
||||
unsigned long val; \
|
||||
int err; \
|
||||
@ -1387,7 +1403,8 @@ static int __devinit w83627ehf_probe(struct platform_device *pdev)
|
||||
goto exit;
|
||||
}
|
||||
|
||||
if (!(data = kzalloc(sizeof(struct w83627ehf_data), GFP_KERNEL))) {
|
||||
data = kzalloc(sizeof(struct w83627ehf_data), GFP_KERNEL);
|
||||
if (!data) {
|
||||
err = -ENOMEM;
|
||||
goto exit_release;
|
||||
}
|
||||
@ -1508,10 +1525,11 @@ static int __devinit w83627ehf_probe(struct platform_device *pdev)
|
||||
w83627ehf_update_fan_div(data);
|
||||
|
||||
/* Register sysfs hooks */
|
||||
for (i = 0; i < ARRAY_SIZE(sda_sf3_arrays); i++)
|
||||
if ((err = device_create_file(dev,
|
||||
&sda_sf3_arrays[i].dev_attr)))
|
||||
for (i = 0; i < ARRAY_SIZE(sda_sf3_arrays); i++) {
|
||||
err = device_create_file(dev, &sda_sf3_arrays[i].dev_attr);
|
||||
if (err)
|
||||
goto exit_remove;
|
||||
}
|
||||
|
||||
for (i = 0; i < ARRAY_SIZE(sda_sf3_max_step_arrays); i++) {
|
||||
struct sensor_device_attribute *attr =
|
||||
@ -1525,8 +1543,9 @@ static int __devinit w83627ehf_probe(struct platform_device *pdev)
|
||||
/* if fan4 is enabled create the sf3 files for it */
|
||||
if ((data->has_fan & (1 << 3)) && data->pwm_num >= 4)
|
||||
for (i = 0; i < ARRAY_SIZE(sda_sf3_arrays_fan4); i++) {
|
||||
if ((err = device_create_file(dev,
|
||||
&sda_sf3_arrays_fan4[i].dev_attr)))
|
||||
err = device_create_file(dev,
|
||||
&sda_sf3_arrays_fan4[i].dev_attr);
|
||||
if (err)
|
||||
goto exit_remove;
|
||||
}
|
||||
|
||||
@ -1696,7 +1715,8 @@ static int __init w83627ehf_find(int sioaddr, unsigned short *addr,
|
||||
/* Activate logical device if needed */
|
||||
val = superio_inb(sioaddr, SIO_REG_ENABLE);
|
||||
if (!(val & 0x01)) {
|
||||
pr_warn("Forcibly enabling Super-I/O. Sensor is probably unusable.\n");
|
||||
pr_warn("Forcibly enabling Super-I/O. "
|
||||
"Sensor is probably unusable.\n");
|
||||
superio_outb(sioaddr, SIO_REG_ENABLE, val | 0x01);
|
||||
}
|
||||
|
||||
@ -1733,7 +1753,8 @@ static int __init sensors_w83627ehf_init(void)
|
||||
if (err)
|
||||
goto exit;
|
||||
|
||||
if (!(pdev = platform_device_alloc(DRVNAME, address))) {
|
||||
pdev = platform_device_alloc(DRVNAME, address);
|
||||
if (!pdev) {
|
||||
err = -ENOMEM;
|
||||
pr_err("Device allocation failed\n");
|
||||
goto exit_unregister;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user