The patch titled
RTC: replace some newly-introduced macros with inlines
has been removed from the -mm tree. Its filename was
rtc-simplified-rtc-sysfs-attribute-handling-tidy.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: RTC: replace some newly-introduced macros with inlines
From: David Brownell <[EMAIL PROTECTED]>
Signed-off-by: David Brownell <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---
drivers/rtc/rtc-core.h | 46 +++++++++++++++++++++++++++++----------
1 file changed, 35 insertions(+), 11 deletions(-)
diff -puN
drivers/rtc/rtc-core.h~rtc-simplified-rtc-sysfs-attribute-handling-tidy
drivers/rtc/rtc-core.h
--- a/drivers/rtc/rtc-core.h~rtc-simplified-rtc-sysfs-attribute-handling-tidy
+++ a/drivers/rtc/rtc-core.h
@@ -7,22 +7,38 @@ extern void rtc_dev_del_device(struct rt
#else
-#define rtc_dev_init() do{}while(0)
-#define rtc_dev_exit() do{}while(0)
-#define rtc_dev_add_device(r) do{}while(0)
-#define rtc_dev_del_device(r) do{}while(0)
+static inline void rtc_dev_init(void)
+{
+}
+
+static inline void rtc_dev_exit(void)
+{
+}
+
+static inline void rtc_dev_add_device(struct rtc_device *rtc)
+{
+}
+
+static inline void rtc_dev_del_device(struct rtc_device *rtc)
+{
+}
#endif
#ifdef CONFIG_RTC_INTF_PROC
-void rtc_proc_add_device(struct rtc_device *rtc);
-void rtc_proc_del_device(struct rtc_device *rtc);
+extern void rtc_proc_add_device(struct rtc_device *rtc);
+extern void rtc_proc_del_device(struct rtc_device *rtc);
#else
-#define rtc_proc_add_device(r) do{}while(0)
-#define rtc_proc_del_device(r) do{}while(0)
+static inline void rtc_proc_add_device(struct rtc_device *rtc)
+{
+}
+
+static inline void rtc_proc_del_device(struct rtc_device *rtc)
+{
+}
#endif
@@ -34,8 +50,16 @@ extern void rtc_sysfs_del_device(struct
#else
-#define rtc_sysfs_init(c) do{}while(0)
-#define rtc_sysfs_add_device(r) do{}while(0)
-#define rtc_sysfs_del_device(r) do{}while(0)
+static inline void rtc_sysfs_init(struct class *rtc)
+{
+}
+
+static inline void rtc_sysfs_add_device(struct rtc_device *rtc)
+{
+}
+
+static inline void rtc_sysfs_del_device(struct rtc_device *rtc)
+{
+}
#endif
_
Patches currently in -mm which might be from [EMAIL PROTECTED] are
origin.patch
acpi-driver-model-flags-and-platform_enable_wake.patch
update-documentation-driver-model-platformtxt.patch
use-common-cpu_is_xxx-macros-on-at91-and-avr32.patch
atmel_spi-remove-unnecessary-and-wrong-ifdefs.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
