From: Corentin Labbe <clabbe.montjoie@gmail.com>
To: jdelvare@suse.com, linux@roeck-us.net
Cc: linux-hwmon@vger.kernel.org, linux-kernel@vger.kernel.org,
Corentin Labbe <clabbe.montjoie@gmail.com>
Subject: [PATCH 5/7] hwmon: adm1029: Fix Logical continuations should be on the previous line checkpatch warning
Date: Fri, 18 Jan 2019 15:03:27 +0100 [thread overview]
Message-ID: <20190118140329.18970-6-clabbe.montjoie@gmail.com> (raw)
In-Reply-To: <20190118140329.18970-1-clabbe.montjoie@gmail.com>
This patchs fix the "Logical continuations should be on the previous line" checkpatch warning.
Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com>
---
drivers/hwmon/adm1029.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/drivers/hwmon/adm1029.c b/drivers/hwmon/adm1029.c
index f9f4f1f4a4c7..4339f6b864a1 100644
--- a/drivers/hwmon/adm1029.c
+++ b/drivers/hwmon/adm1029.c
@@ -131,8 +131,7 @@ static struct adm1029_data *adm1029_update_device(struct device *dev)
* Use the "cache" Luke, don't recheck values
* if there are already checked not a long time later
*/
- if (time_after(jiffies, data->last_updated + HZ * 2)
- || !data->valid) {
+ if (time_after(jiffies, data->last_updated + HZ * 2) || !data->valid) {
int nr;
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);
u16 val;
- if (data->fan[attr->index] == 0
- || (data->fan_div[attr->index] & 0xC0) == 0
- || data->fan[attr->index] == 255) {
+ if (data->fan[attr->index] == 0 ||
+ (data->fan_div[attr->index] & 0xC0) == 0 ||
+ data->fan[attr->index] == 255) {
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,
ADM1029_REG_NB_FAN_SUPPORT);
/* 0x41 is Analog Devices */
- if (man_id != 0x41 || (temp_devices_installed & 0xf9) != 0x01
- || nb_fan_support != 0x03)
+ if (man_id != 0x41 || (temp_devices_installed & 0xf9) != 0x01 ||
+ nb_fan_support != 0x03)
return -ENODEV;
if ((chip_id & 0xF0) != 0x00) {
--
2.19.2
next prev parent reply other threads:[~2019-01-18 14:03 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-18 14:03 [PATCH 0/7] hwmon: adm1029: Fix most style problem Corentin Labbe
2019-01-18 14:03 ` [PATCH 1/7] hwmon: adm1029: Remove write to FFF paragraph Corentin Labbe
2019-01-18 14:03 ` [PATCH 2/7] hwmon: adm1029: Add SPDX header Corentin Labbe
2019-01-18 14:03 ` [PATCH 3/7] hwmon: adm1029: replace S_IXXX macros by their numeric values Corentin Labbe
2019-01-18 14:03 ` [PATCH 4/7] hwmon: adm1029: Add blank line after declarations Corentin Labbe
2019-01-18 14:03 ` Corentin Labbe [this message]
2019-01-18 14:03 ` [PATCH 6/7] hwmon: adm1029: Fix function alignment Corentin Labbe
2019-01-18 14:03 ` [PATCH 7/7] hwmon: adm1029: Add a comment for locking mutex Corentin Labbe
2019-01-18 14:20 ` [PATCH 0/7] hwmon: adm1029: Fix most style problem Guenter Roeck
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190118140329.18970-6-clabbe.montjoie@gmail.com \
--to=clabbe.montjoie@gmail.com \
--cc=jdelvare@suse.com \
--cc=linux-hwmon@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@roeck-us.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®