[kernel] r18904 - in dists/sid/linux-2.6/debian/patches: debian series

[Ben Hutchings]

Author: benh
Date: Wed Apr  4 04:35:20 2012
New Revision: 18904

Log:
Revert "rtc: Provide flag for rtc devices that don't support UIE"

This reverts commit 61d38cd909ad35ff497bf1a84cd57b2baf6d9c49.
It changes ABI and is only needed for rtc-mpc5121 which we don't
enable.

Added:
   dists/sid/linux-2.6/debian/patches/debian/revert-rtc-Provide-flag-for-rtc-devices-that-don-t-s.patch
Modified:
   dists/sid/linux-2.6/debian/patches/series/base

Added: dists/sid/linux-2.6/debian/patches/debian/revert-rtc-Provide-flag-for-rtc-devices-that-don-t-s.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/debian/revert-rtc-Provide-flag-for-rtc-devices-that-don-t-s.patch	Wed Apr  4 04:35:20 2012	(r18904)
@@ -0,0 +1,60 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Wed, 4 Apr 2012 05:32:11 +0100
+Subject: [PATCH] Revert "rtc: Provide flag for rtc devices that don't support
+ UIE"
+
+This reverts commit 61d38cd909ad35ff497bf1a84cd57b2baf6d9c49.
+It changes ABI and is only needed for rtc-mpc5121 which we don't
+enable.
+---
+ drivers/rtc/interface.c   |    5 -----
+ drivers/rtc/rtc-mpc5121.c |    2 --
+ include/linux/rtc.h       |    3 +--
+ 3 files changed, 1 insertion(+), 9 deletions(-)
+
+diff --git a/drivers/rtc/interface.c b/drivers/rtc/interface.c
+index 565742b..c1edbf8 100644
+--- a/drivers/rtc/interface.c
++++ b/drivers/rtc/interface.c
+@@ -445,11 +445,6 @@ int rtc_update_irq_enable(struct rtc_device *rtc, unsigned int enabled)
+ 	if (rtc->uie_rtctimer.enabled == enabled)
+ 		goto out;
+ 
+-	if (rtc->uie_unsupported) {
+-		err = -EINVAL;
+-		goto out;
+-	}
+-
+ 	if (enabled) {
+ 		struct rtc_time tm;
+ 		ktime_t now, onesec;
+diff --git a/drivers/rtc/rtc-mpc5121.c b/drivers/rtc/rtc-mpc5121.c
+index 0fc2d22..da60915 100644
+--- a/drivers/rtc/rtc-mpc5121.c
++++ b/drivers/rtc/rtc-mpc5121.c
+@@ -360,8 +360,6 @@ static int __devinit mpc5121_rtc_probe(struct platform_device *op)
+ 						&mpc5200_rtc_ops, THIS_MODULE);
+ 	}
+ 
+-	rtc->rtc->uie_unsupported = 1;
+-
+ 	if (IS_ERR(rtc->rtc)) {
+ 		err = PTR_ERR(rtc->rtc);
+ 		goto out_free_irq;
+diff --git a/include/linux/rtc.h b/include/linux/rtc.h
+index fcabfb4..93f4d03 100644
+--- a/include/linux/rtc.h
++++ b/include/linux/rtc.h
+@@ -202,8 +202,7 @@ struct rtc_device
+ 	struct hrtimer pie_timer; /* sub second exp, so needs hrtimer */
+ 	int pie_enabled;
+ 	struct work_struct irqwork;
+-	/* Some hardware can't support UIE mode */
+-	int uie_unsupported;
++
+ 
+ #ifdef CONFIG_RTC_INTF_DEV_UIE_EMUL
+ 	struct work_struct uie_task;
+-- 
+1.7.9.5
+

Modified: dists/sid/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/base	Wed Apr  4 01:11:21 2012	(r18903)
+++ dists/sid/linux-2.6/debian/patches/series/base	Wed Apr  4 04:35:20 2012	(r18904)
@@ -87,3 +87,6 @@
 
 # Temporary, until the Xen regression is fixed
 + debian/revert-x86-ioapic-Add-register-level-checks-to-detec.patch
+
+# Temporary, until the next ABI bump
++ debian/revert-rtc-Provide-flag-for-rtc-devices-that-don-t-s.patch