diff options
Diffstat (limited to 'drivers/rtc/rtc-v3020.c')
-rw-r--r-- | drivers/rtc/rtc-v3020.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/rtc/rtc-v3020.c b/drivers/rtc/rtc-v3020.c index 6e0cba8f47d5..d07d89823020 100644 --- a/drivers/rtc/rtc-v3020.c +++ b/drivers/rtc/rtc-v3020.c | |||
@@ -16,7 +16,7 @@ | |||
16 | * - Use the generic rtc class | 16 | * - Use the generic rtc class |
17 | * | 17 | * |
18 | * ??-???-2004: Someone at Compulab | 18 | * ??-???-2004: Someone at Compulab |
19 | * - Initial driver creation. | 19 | * - Initial driver creation. |
20 | * | 20 | * |
21 | */ | 21 | */ |
22 | #include <linux/platform_device.h> | 22 | #include <linux/platform_device.h> |
@@ -278,13 +278,13 @@ static int v3020_set_time(struct device *dev, struct rtc_time *dt) | |||
278 | dev_dbg(dev, "tm_year: %i\n", dt->tm_year); | 278 | dev_dbg(dev, "tm_year: %i\n", dt->tm_year); |
279 | 279 | ||
280 | /* Write all the values to ram... */ | 280 | /* Write all the values to ram... */ |
281 | v3020_set_reg(chip, V3020_SECONDS, bin2bcd(dt->tm_sec)); | 281 | v3020_set_reg(chip, V3020_SECONDS, bin2bcd(dt->tm_sec)); |
282 | v3020_set_reg(chip, V3020_MINUTES, bin2bcd(dt->tm_min)); | 282 | v3020_set_reg(chip, V3020_MINUTES, bin2bcd(dt->tm_min)); |
283 | v3020_set_reg(chip, V3020_HOURS, bin2bcd(dt->tm_hour)); | 283 | v3020_set_reg(chip, V3020_HOURS, bin2bcd(dt->tm_hour)); |
284 | v3020_set_reg(chip, V3020_MONTH_DAY, bin2bcd(dt->tm_mday)); | 284 | v3020_set_reg(chip, V3020_MONTH_DAY, bin2bcd(dt->tm_mday)); |
285 | v3020_set_reg(chip, V3020_MONTH, bin2bcd(dt->tm_mon + 1)); | 285 | v3020_set_reg(chip, V3020_MONTH, bin2bcd(dt->tm_mon + 1)); |
286 | v3020_set_reg(chip, V3020_WEEK_DAY, bin2bcd(dt->tm_wday)); | 286 | v3020_set_reg(chip, V3020_WEEK_DAY, bin2bcd(dt->tm_wday)); |
287 | v3020_set_reg(chip, V3020_YEAR, bin2bcd(dt->tm_year % 100)); | 287 | v3020_set_reg(chip, V3020_YEAR, bin2bcd(dt->tm_year % 100)); |
288 | 288 | ||
289 | /* ...and set the clock. */ | 289 | /* ...and set the clock. */ |
290 | v3020_set_reg(chip, V3020_CMD_RAM2CLOCK, 0); | 290 | v3020_set_reg(chip, V3020_CMD_RAM2CLOCK, 0); |
@@ -320,7 +320,7 @@ static int rtc_probe(struct platform_device *pdev) | |||
320 | 320 | ||
321 | retval = chip->ops->map_io(chip, pdev, pdata); | 321 | retval = chip->ops->map_io(chip, pdev, pdata); |
322 | if (retval) | 322 | if (retval) |
323 | goto err_chip; | 323 | return retval; |
324 | 324 | ||
325 | /* Make sure the v3020 expects a communication cycle | 325 | /* Make sure the v3020 expects a communication cycle |
326 | * by reading 8 times */ | 326 | * by reading 8 times */ |
@@ -364,7 +364,7 @@ static int rtc_probe(struct platform_device *pdev) | |||
364 | 364 | ||
365 | err_io: | 365 | err_io: |
366 | chip->ops->unmap_io(chip); | 366 | chip->ops->unmap_io(chip); |
367 | err_chip: | 367 | |
368 | return retval; | 368 | return retval; |
369 | } | 369 | } |
370 | 370 | ||