leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hwmon: (adm1029) Fix Logical continuations should be on the previous line checkpatch warning

Browse Source 
This patchs fix the "Logical continuations should be on the previous line" checkpatch warning.

Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
This commit is contained in:
Corentin Labbe 2019-01-18 15:03:27 +01:00 committed by Guenter Roeck
parent 66b331ca28
commit d6450e8524
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/hwmon/adm1029.c
View File

@ -131,8 +131,7 @@ static struct adm1029_data *adm1029_update_device(struct device *dev)
* Use the "cache" Luke, don't recheck values * Use the "cache" Luke, don't recheck values
* if there are already checked not a long time later * if there are already checked not a long time later
*/ */
if (time_after(jiffies, data->last_updated + HZ * 2) if (time_after(jiffies, data->last_updated + HZ * 2) || !data->valid) {
|| !data->valid) {
int nr; int nr;
dev_dbg(&client->dev, "Updating adm1029 data\n"); dev_dbg(&client->dev, "Updating adm1029 data\n");
@ -182,9 +181,9 @@ show_fan(struct device *dev, struct device_attribute *devattr, char *buf)
struct adm1029_data *data = adm1029_update_device(dev); struct adm1029_data *data = adm1029_update_device(dev);
u16 val; u16 val;
if (data->fan[attr->index] == 0 if (data->fan[attr->index] == 0 ||
|| (data->fan_div[attr->index] & 0xC0) == 0 (data->fan_div[attr->index] & 0xC0) == 0 ||
|| data->fan[attr->index] == 255) { data->fan[attr->index] == 255) {
return sprintf(buf, "0\n"); return sprintf(buf, "0\n");
} }
@ -325,8 +324,8 @@ static int adm1029_detect(struct i2c_client *client,
nb_fan_support = i2c_smbus_read_byte_data(client, nb_fan_support = i2c_smbus_read_byte_data(client,
ADM1029_REG_NB_FAN_SUPPORT); ADM1029_REG_NB_FAN_SUPPORT);
/* 0x41 is Analog Devices */ /* 0x41 is Analog Devices */
if (man_id != 0x41 || (temp_devices_installed & 0xf9) != 0x01 if (man_id != 0x41 || (temp_devices_installed & 0xf9) != 0x01 ||
|| nb_fan_support != 0x03) nb_fan_support != 0x03)
return -ENODEV; return -ENODEV;
if ((chip_id & 0xF0) != 0x00) { if ((chip_id & 0xF0) != 0x00) {