Message ID | 20161129110437epcms5p3214f832f54aedeed6d0d8e1c32109ce1@epcms5p3 |
---|---|
State | Accepted |
Headers | show
Return-Path: <rtc-linux+bncBC57DJ5R4ECBBSGB6XAQKGQEHCGFRRA@googlegroups.com> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-ua0-f190.google.com (mail-ua0-f190.google.com [209.85.217.190]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tSgfz6WY6z9t2C for <incoming@patchwork.ozlabs.org>; Tue, 29 Nov 2016 22:04:43 +1100 (AEDT) Received: by mail-ua0-f190.google.com with SMTP id 51sf2026233uai.0 for <incoming@patchwork.ozlabs.org>; Tue, 29 Nov 2016 03:04:43 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:subject:reply-to:sender:from:to:cc :message-id:date:cms-type:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=vGhKGOn4mes+8bbxNLZKn3Qf2SMvG0MFlGpT0/TeUfE=; b=dk7AwIhplemr2ezgyk5rKgwgywW/d7ZetRG7qonl7OoRo6mfkTY6ka5PfM+aUukTnw 17TeeDEfMx9Za72EHS0jdtCiF4Y39Tf4/eDlOzuVkr8Gqhtv8iedkwzYaH8jwZcWRf6u CvmDvxPERNnhPJBqSUNukLUrRn6aFSCensi+U41XbG5nO1Mc/w91U/YNAE47Kq9dUb75 ryvvURgxLQAj1xQrXsAgpt0GP+N0PHsN7qgfhrVXt2mvKqhA7Zt24kmCpifKIYjkGB/r K1oinpjLM+yf3G8WKolSZlwy15nxix2UlrzK24oXbkm289SU0QsH6d9oe32Um5dRP1nm 8pEg== X-Gm-Message-State: AKaTC03iC6YyzTTH/WKMqJ4VtBLasHmti6D0f74DGqKhsKWv5GBcOJml6hB8KcgtK8o9vg== X-Received: by 10.157.37.125 with SMTP id j58mr868243otd.18.1480417480965; Tue, 29 Nov 2016 03:04:40 -0800 (PST) X-BeenThere: rtc-linux@googlegroups.com Received: by 10.157.43.24 with SMTP id o24ls11762167otb.41.gmail; Tue, 29 Nov 2016 03:04:40 -0800 (PST) X-Received: by 10.157.52.240 with SMTP id t45mr6069689otd.148.1480417480594; Tue, 29 Nov 2016 03:04:40 -0800 (PST) Received: from mailout1.samsung.com (mailout1.samsung.com. [203.254.224.24]) by gmr-mx.google.com with ESMTPS id p14si542033pfl.0.2016.11.29.03.04.40 for <rtc-linux@googlegroups.com> (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 29 Nov 2016 03:04:40 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of s.ritolia@samsung.com designates 203.254.224.24 as permitted sender) client-ip=203.254.224.24; Received: from epcas5p2.samsung.com (unknown [182.195.41.40]) by mailout1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0OHE0207VHFQSIE0@mailout1.samsung.com> for rtc-linux@googlegroups.com; Tue, 29 Nov 2016 20:04:38 +0900 (KST) Received: from epsmges5p2.samsung.com (unknown [182.195.42.45]) by epcas5p1.samsung.com (KnoxPortal) with ESMTP id 20161129110438epcas5p1382b9927d56b8f92feec0728af88c34e~Lf9pdqMR72294522945epcas5p15; Tue, 29 Nov 2016 11:04:38 +0000 (GMT) X-AuditID: b6c32a2d-f79b26d0000012bb-88-583d60c6286a Received: from epcas5p2.samsung.com ( [182.195.41.40]) by epsmges5p2.samsung.com (EPCPMTA) with SMTP id 89.2F.04795.6C06D385; Tue, 29 Nov 2016 20:04:38 +0900 (KST) MIME-version: 1.0 Subject: [rtc-linux] [PATCH] rtc: ds1374: Merge conditional + WARN_ON() Reply-to: rtc-linux@googlegroups.com Sender: =?UTF-8?B?U3Jpa2FudCBSaXRvbGlh?= <s.ritolia@samsung.com> From: =?UTF-8?B?U3Jpa2FudCBSaXRvbGlh?= <s.ritolia@samsung.com> To: =?UTF-8?B?YS56dW1tb0B0b3dlcnRlY2guaXQ=?= <a.zummo@towertech.it>, =?UTF-8?B?YWxleGFuZHJlLmJlbGxvbmlAZnJlZS1lbGVjdHJvbnMuY29t?= <alexandre.belloni@free-electrons.com> Cc: =?UTF-8?B?cnRjLWxpbnV4QGdvb2dsZWdyb3Vwcy5jb20=?= <rtc-linux@googlegroups.com>, =?UTF-8?B?UmFtIFJlZGR5?= <ram.r@samsung.com>, =?UTF-8?B?QXNoaXNoIEthbHJh?= <ashish.kalra@samsung.com> X-Priority: 3 X-Content-Kind-Code: NORMAL X-Drm-Type: N,general X-EPLocale: en_US.EUC-KR X-EPWebmail-Msg-Type: personal X-Msg-Generator: Mail X-Msg-Type: PERSONAL X-Reply-Demand: N X-Sender: =?utf-8?B?7IK87ISx7KCE7J6QG1NSSS1Ob2lkYS1BZHZhbmNl?= =?utf-8?B?IFNvbHV0aW9ucyAtIFN5c3RlbSAxIFI=?= =?utf-8?B?JkQgR3JvdXAbRW5naW5lZXIvQ29ycG8=?= =?utf-8?B?cmF0ZSBBc3Npc3RhbnQgRW5naW5lZXI=?= X-Sender-IP: 107.108.173.194 X-Local-Sender: =?UTF-8?B?U3Jpa2FudCBSaXRvbGlhG1NSSS1Ob2lkYS1BZHZhbmNlIFNvbHV0aW9u?= =?UTF-8?B?cyAtIFN5c3RlbSAxIFImRCBHcm91cBvsgrzshLHsoITsnpAb?= =?UTF-8?B?RW5naW5lZXIvQ29ycG9yYXRlIEFzc2lzdGFudCBFbmdpbmVl?= =?UTF-8?B?cg==?= X-Global-Sender: =?UTF-8?B?U3Jpa2FudCBSaXRvbGlhG1NSSS1Ob2lkYS1BZHZhbmNlIFNvbHV0aW9u?= =?UTF-8?B?cyAtIFN5c3RlbSAxIFImRCBHcm91cBtTYW1zdW5nIEVsZWN0?= =?UTF-8?B?cm9uaWNzG0VuZ2luZWVyL0NvcnBvcmF0ZSBBc3Npc3RhbnQg?= =?UTF-8?B?RW5naW5lZXI=?= X-Sender-Code: =?UTF-8?B?QzEwGxtDMTBJWjAxSVowMTgxMjU=?= Message-id: <20161129110437epcms5p3214f832f54aedeed6d0d8e1c32109ce1@epcms5p3> Date: Tue, 29 Nov 2016 11:04:37 +0000 X-CMS-MailID: 20161129110437epcms5p3214f832f54aedeed6d0d8e1c32109ce1 Content-type: multipart/related; boundary="----=_Part_139760_2117590721.1480417477913" X-MTR: 20161129110437epcms5p3214f832f54aedeed6d0d8e1c32109ce1 X-EPHeader: Mail X-ConfirmMail: N,general CMS-TYPE: 105P X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprCKsWRmVeSWpSXmKPExsWy7bCmhu6xBNsIg4k3RCyWXLzKbtFxbTGT xf1p39gtnpx5zGSxv7OD0YHV48mmi4weeyaeZPPo27KK0WP6vJ9MASxRXDYpqTmZZalF+nYJ XBnTrm5iL3jBUbHnW2wD40GOLkZODgkBE4kVD7eyQdhiEhfurQezhQSWMkq0/+fuYuTg4BUQ lPi7QxgkLCyQIfFm9XNmkLCQgLzErwmuEGEHiVdz+sE62QTsJB4972HtYuTiEBFYwyjRfeEo M4jDLLCHUeLW5t0sELt4JWa0P4WypSW2L9/KCGGLStxc/ZYdwpaQWL3wOdRtchLTvq5hhql5 f2w+VL2IROu9s1BxQYkHP3dDxU8zShw9Lwdhy0g86trECHKEhMBTRonD5yewQjjvGCUe/T/F DvKOhIC5xIb/ZRAP+0rs6Y4AMVkEVCX235KFKHCR2NQaBDKRWSBCounQI6jLbCVub34BtVVA Ys2JOcww129tecIKUc8n0fv7CRNEXFmi//0H5gmMKrMQgTsLyVQIW1FiSvdDdpASZgFNifW7 9BcwsqxiFEstKM5NTy02LTDSK07MLS7NS9dLzs/dxAhOK1q6Oxi/LPA+xCjAwajEwztji02E EGtiWXFl7iFGCQ5mJRHeE3G2EUK8KYmVValF+fFFpTmpxYcYpTlYlMR5F1RYRwgJpCeWpGan phakFsFkmTg4pRoY5W8EzFXezOa/TZu34V3o86V/mlesS/pi+l5q6qoLq7dJeH8XKL+xde71 P5Fh64K4bY9NlnlzQurFkokCOVVWm96cefn99+6VLfu7N6n6pNdP+ikjnrInXXvbhFivQpXa ILXD3qkb3z5OjP0RIpBz5LxHeK/Y0hj3D++lZ+t8upqk1CJZJJiWrMRSnJFoqMVcVJwIAOcT YREnAwAA X-Auth-Email: s.ritolia@samsung.com X-HopCount: 6 X-CMS-RootMailID: 20161129110437epcms5p3214f832f54aedeed6d0d8e1c32109ce1 X-RootMTR: 20161129110437epcms5p3214f832f54aedeed6d0d8e1c32109ce1 References: <CGME20161129110437epcms5p3214f832f54aedeed6d0d8e1c32109ce1@epcms5p3> X-Original-Sender: s.ritolia@samsung.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: best guess record for domain of s.ritolia@samsung.com designates 203.254.224.24 as permitted sender) smtp.mailfrom=s.ritolia@samsung.com Precedence: list Mailing-list: list rtc-linux@googlegroups.com; contact rtc-linux+owners@googlegroups.com List-ID: <rtc-linux.googlegroups.com> X-Spam-Checked-In-Group: rtc-linux@googlegroups.com X-Google-Group-Id: 712029733259 List-Post: <https://groups.google.com/group/rtc-linux/post>, <mailto:rtc-linux@googlegroups.com> List-Help: <https://groups.google.com/support/>, <mailto:rtc-linux+help@googlegroups.com> List-Archive: <https://groups.google.com/group/rtc-linux List-Subscribe: <https://groups.google.com/group/rtc-linux/subscribe>, <mailto:rtc-linux+subscribe@googlegroups.com> List-Unsubscribe: <mailto:googlegroups-manage+712029733259+unsubscribe@googlegroups.com>, <https://groups.google.com/group/rtc-linux/subscribe> |
On 29/11/2016 at 11:04:37 +0000, Srikant Ritolia wrote : > WARN_ON does both these things in one statement. > Using a better pattern with WARN_ON(). > > Signed-off-by: Srikant Ritolia <s.ritolia@samsung.com> > --- > drivers/rtc/rtc-ds1374.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > Applied, thanks.
diff --git a/drivers/rtc/rtc-ds1374.c b/drivers/rtc/rtc-ds1374.c index 3b3049c..52429f0 100644 --- a/drivers/rtc/rtc-ds1374.c +++ b/drivers/rtc/rtc-ds1374.c @@ -89,10 +89,8 @@ static int ds1374_read_rtc(struct i2c_client *client, u32 *time, int ret; int i; - if (nbytes > 4) { - WARN_ON(1); + if (WARN_ON(nbytes > 4)) return -EINVAL; - } ret = i2c_smbus_read_i2c_block_data(client, reg, nbytes, buf);
WARN_ON does both these things in one statement. Using a better pattern with WARN_ON(). Signed-off-by: Srikant Ritolia <s.ritolia@samsung.com> --- drivers/rtc/rtc-ds1374.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)