Commit dfe91c97 authored Jul 17, 2015 by Linus Torvalds

linux

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 f98b733e ("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

parents 3f8476fe d80238bb

drivers/rtc/rtc-armada38x.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -88,7 +88,7 @@ static int armada38x_rtc_set_time(struct device dev, struct rtc_time tm)
		{
		struct armada38x_rtc *rtc = dev_get_drvdata(dev);
		int ret = 0;
		unsigned long time, flags;
		unsigned long time;

		ret = rtc_tm_to_time(tm, &time);

drivers/rtc/rtc-mt6397.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -343,6 +343,8 @@ static int mtk_rtc_probe(struct platform_device *pdev)
		goto out_dispose_irq;
		}

		device_init_wakeup(&pdev->dev, 1);

		rtc->rtc_dev = rtc_device_register("mt6397-rtc", &pdev->dev,
		&mtk_rtc_ops, THIS_MODULE);
		if (IS_ERR(rtc->rtc_dev)) {
		@@ -351,8 +353,6 @@ static int mtk_rtc_probe(struct platform_device *pdev)
		goto out_free_irq;
		}

		device_init_wakeup(&pdev->dev, 1);

		return 0;

		out_free_irq:

Admin message