From patchwork Fri Jan 18 14:03:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Labbe X-Patchwork-Id: 155935 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp3290871jaa; Fri, 18 Jan 2019 06:03:52 -0800 (PST) X-Google-Smtp-Source: ALg8bN7bTGPQHs2gEK9f0M2npInwzfb2E4HM0oRiy3ZuWgLW69OgDc9KJNAk+TMr27/RZ4YSPioB X-Received: by 2002:a62:6799:: with SMTP id t25mr19444405pfj.139.1547820232117; Fri, 18 Jan 2019 06:03:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547820232; cv=none; d=google.com; s=arc-20160816; b=CyEFY3R55jHNLqXIVmhA52gW10AVPIm3PL9M6+dP4CSidRphjbGBGfwp8ojFjCvCGy RUTxWIitm/NZOkaT0NvH7YHWbMJN4KERJtsopOsda9H2zkVImHwXt6CjVfBlbGRZaV90 5FEk7tG8r/7cNmMpMc1xw/rfzUwvteqLTtkNiHOAGeoAGMhmiK92MuwT0A1y/M3FLaS6 +78t9/p3I3zTTu6QmeLn0okMGs5sPyUFP4beipWeTJBmR59SCwIQCqJ3vYz3XeHCYvBo VDnv8Gsq3kg+VTm+9MbPPBLZz396Ir5Uu2nWRj4YVMBdO5OO+CQl2A5mKqT8ru4CHKxm YHuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=52hWXrVesE9hsYVcvtF6fWpIkVgqCxxIYdkUhzqrpz8=; b=bfkA33cuuaiE6M6DbK1hzt/dU0sfapxvx38zh7RJHIpt+zuwCNP4uOm/GYAigEt8rP 1NHZ6jE6mdTQ9gExADqUoYZVRycmGI07oJkkFj0qeE1q/ip+7c8g3NtXJMr33VDezDPt JXFFBVoa7YedayWJUlwj/HxoBPqtmtVvlbnBQvstUPqWP2sCw4eTHLvt1VOE+NA1dUC1 85sv4hti3Ii6OssjF60l4ufhAzfmb4gtaigP58ajIGUw8Nfav0w7ahivANrXEif+c0x2 svOMhu0gVt2qw2Hqz5nrQCO4734vPfNW3HNQ3q5z728303Hcexl7ZXc3lnXZmY7LTVlH pCOQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=EooudYQj; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q3si3448811plb.209.2019.01.18.06.03.51; Fri, 18 Jan 2019 06:03:52 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=EooudYQj; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727628AbfARODp (ORCPT + 12 others); Fri, 18 Jan 2019 09:03:45 -0500 Received: from mail-wm1-f68.google.com ([209.85.128.68]:50281 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727285AbfARODn (ORCPT ); Fri, 18 Jan 2019 09:03:43 -0500 Received: by mail-wm1-f68.google.com with SMTP id n190so4631504wmd.0; Fri, 18 Jan 2019 06:03:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=52hWXrVesE9hsYVcvtF6fWpIkVgqCxxIYdkUhzqrpz8=; b=EooudYQjYAyQVnH01dtyFpFmvjNbyz5EvGFVvYLY2VvATnvqjEY01XCZ1/PHkmq60T QUJOoHTJt1i2OPCZY1HELOGT1zMHL8Rq7uJO04W60uPo8soxOXurj27qP/ft7/xOsCVK 2m33r5yQfb2cisVOxJeAdyQG01mF9iaollNmF2ZTNFpGMAzxv0DAacaUI1Hl3yjYYT9P 5teW7gk/TBZevv7h6mPHeukCTwj0aUTQYxIX3BK54iJ8ufSlmLpjVOjp9jPO5yEtsvYo KKnPEcRiwNllQygPHuJRja4IHRRqNcvYowloif1boMaajzcx7WW82vGu/g56RH1Ed4Ej JxYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=52hWXrVesE9hsYVcvtF6fWpIkVgqCxxIYdkUhzqrpz8=; b=fq1frvln0LetXNV/1pqR/Gf71CTLy1+UAWBg/TXTmUoKVw9Nlx9xp85kwK/dMXxaFr cMxLYMMKv/K5sQvfdIw8+HgCaOJ7GUw1lF1yqcnotU+O2PRiWJSejHBQp9hJ6GfRiF+k 77CQ9ODvBTrSqMQsCpRv23xxXGzHmZ00PL5traKFewtYCsDXAWPPUaeKbSJr8/EfDGV5 cU3vtFyYuisQ67PA+mEsRyF27lZF+e1EfRR1w8PL3L+YLNFxSb2DhTp0q/kpTdI0a1tr xCW/IKjzSb9tjx1aD4EWRZAnprtIl3noOfBMugpUwibHUf69YZuvTSYsaCimwDAsNTG2 f/+Q== X-Gm-Message-State: AJcUukf8zTV9nvc60Q8ZuSh0alZr4tzrr1aVFdMvZlphEAcSWREAkzCa PUV9Ky1+RY1kAQggO4F0FwM= X-Received: by 2002:a1c:f319:: with SMTP id q25mr15832227wmq.151.1547820221550; Fri, 18 Jan 2019 06:03:41 -0800 (PST) Received: from Red.local ([2a01:cb1d:147:7200:2e56:dcff:fed2:c6d6]) by smtp.googlemail.com with ESMTPSA id g197sm8464676wmd.29.2019.01.18.06.03.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 Jan 2019 06:03:41 -0800 (PST) From: Corentin Labbe To: jdelvare@suse.com, linux@roeck-us.net Cc: linux-hwmon@vger.kernel.org, linux-kernel@vger.kernel.org, Corentin Labbe 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 Message-Id: <20190118140329.18970-6-clabbe.montjoie@gmail.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190118140329.18970-1-clabbe.montjoie@gmail.com> References: <20190118140329.18970-1-clabbe.montjoie@gmail.com> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patchs fix the "Logical continuations should be on the previous line" checkpatch warning. Signed-off-by: Corentin Labbe --- drivers/hwmon/adm1029.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) -- 2.19.2 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) {