Pull rtc fixes from Alexandre Belloni: "A few fixes for the RTC susbsystem for 4.2. The mt6397 driver was introduce in 4.2 so it is worth fixing before the final release. I though the compilation warning for armada38x was fixed by akpm in commit f98b733e93e0 ("rtc-armada38x.c: remove unused local `flags'") but he actually missed some occurrences of the variables. Since I received 4 patches for that, I think we can include it now. Summary: - fix mt6397 wakealarm creation - remove a compilation warning for armada38x that was forgotten" * tag 'rtc-v4.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: rtc: armada38x: Remove unused variable from armada38x_rtc_set_time() rtc: mt6397: enable wakeup before registering rtc device
Unified · Split
| @@ -88,7 +88,7 @@ static int armada38x_rtc_set_time(struct device *dev, struct rtc_time *tm) · 87 unmodified lines | ||
| 88 | 88 | { |
| 89 | 89 | struct armada38x_rtc *rtc = dev_get_drvdata(dev); |
| 90 | 90 | int ret = 0; |
| 91 | − unsigned long time, flags; | |
| 91 | + unsigned long time; | |
| 92 | 92 | |
| 93 | 93 | ret = rtc_tm_to_time(tm, &time); |
| 94 | 94 | |
| @@ -343,6 +343,8 @@ static int mtk_rtc_probe(struct platform_device *pdev) · 342 unmodified lines | ||
| 343 | 343 | goto out_dispose_irq; |
| 344 | 344 | } |
| 345 | 345 | |
| 346 | + device_init_wakeup(&pdev->dev, 1); | |
| 347 | + | |
| 346 | 348 | rtc->rtc_dev = rtc_device_register("mt6397-rtc", &pdev->dev, |
| 347 | 349 | &mtk_rtc_ops, THIS_MODULE); |
| 348 | 350 | if (IS_ERR(rtc->rtc_dev)) { |
| @@ -351,8 +353,6 @@ static int mtk_rtc_probe(struct platform_device *pdev) · 2 unmodified lines | ||
| 351 | 353 | goto out_free_irq; |
| 352 | 354 | } |
| 353 | 355 | |
| 354 | − device_init_wakeup(&pdev->dev, 1); | |
| 355 | − | |
| 356 | 356 | return 0; |
| 357 | 357 | |
| 358 | 358 | out_free_irq: |