From: Srikant Ritolia Date: Tue, 29 Nov 2016 11:04:37 +0000 (+0000) Subject: rtc: ds1374: Merge conditional + WARN_ON() X-Git-Tag: v4.14-rc1~1818^2~9 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=01835fadf5eda4afdca5c0aa7a89e210ee45bec6;p=platform%2Fkernel%2Flinux-rpi.git rtc: ds1374: Merge conditional + WARN_ON() WARN_ON does both these things in one statement. Using a better pattern with WARN_ON(). Signed-off-by: Srikant Ritolia Signed-off-by: Alexandre Belloni --- 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);