diff options
author | Robert Kmiec <robert.r.kmiec@gmail.com> | 2015-04-16 15:45:01 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-17 09:03:59 -0400 |
commit | b0c57b5941c4a42698d845ada6a76feeba2d1be9 (patch) | |
tree | a2f830b8f23cf73df60e5580966280af6ebba34d /drivers/rtc | |
parent | 6e54abac1b8e0b7febffdbad37b605daef1cfcff (diff) |
drivers/rtc/rtc-pcf8563.c: simplify return from function
This commit does not change any logic here. It just makes the code easier
to read.
This is how it looked like:
If err != 0 return err;
else return 0;
Signed-off-by: Robert Kmiec <robert.r.kmiec@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/rtc')
-rw-r--r-- | drivers/rtc/rtc-pcf8563.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/rtc/rtc-pcf8563.c b/drivers/rtc/rtc-pcf8563.c index 96fb32e7d6f8..0ba7e59929be 100644 --- a/drivers/rtc/rtc-pcf8563.c +++ b/drivers/rtc/rtc-pcf8563.c | |||
@@ -246,7 +246,6 @@ static int pcf8563_get_datetime(struct i2c_client *client, struct rtc_time *tm) | |||
246 | static int pcf8563_set_datetime(struct i2c_client *client, struct rtc_time *tm) | 246 | static int pcf8563_set_datetime(struct i2c_client *client, struct rtc_time *tm) |
247 | { | 247 | { |
248 | struct pcf8563 *pcf8563 = i2c_get_clientdata(client); | 248 | struct pcf8563 *pcf8563 = i2c_get_clientdata(client); |
249 | int err; | ||
250 | unsigned char buf[9]; | 249 | unsigned char buf[9]; |
251 | 250 | ||
252 | dev_dbg(&client->dev, "%s: secs=%d, mins=%d, hours=%d, " | 251 | dev_dbg(&client->dev, "%s: secs=%d, mins=%d, hours=%d, " |
@@ -272,12 +271,8 @@ static int pcf8563_set_datetime(struct i2c_client *client, struct rtc_time *tm) | |||
272 | 271 | ||
273 | buf[PCF8563_REG_DW] = tm->tm_wday & 0x07; | 272 | buf[PCF8563_REG_DW] = tm->tm_wday & 0x07; |
274 | 273 | ||
275 | err = pcf8563_write_block_data(client, PCF8563_REG_SC, | 274 | return pcf8563_write_block_data(client, PCF8563_REG_SC, |
276 | 9 - PCF8563_REG_SC, buf + PCF8563_REG_SC); | 275 | 9 - PCF8563_REG_SC, buf + PCF8563_REG_SC); |
277 | if (err) | ||
278 | return err; | ||
279 | |||
280 | return 0; | ||
281 | } | 276 | } |
282 | 277 | ||
283 | #ifdef CONFIG_RTC_INTF_DEV | 278 | #ifdef CONFIG_RTC_INTF_DEV |