X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=drivers%2Frtc%2Frtc-core.h;h=5f9df7430a22728a7a1ce7941ef9f5898c476b70;hb=584dbe9475313e117abf9d2af88164edfd429c9a;hp=30bcd14377c51ee74b9468363697aa99dd2490f1;hpb=446ecbd925dc580c9972049c926c17aa8d967fe4;p=safe%2Fjmp%2Flinux-2.6

diff --git a/drivers/rtc/rtc-core.h b/drivers/rtc/rtc-core.h
index 30bcd14..5f9df74 100644
--- a/drivers/rtc/rtc-core.h
+++ b/drivers/rtc/rtc-core.h
@@ -1,18 +1,49 @@
-extern int rtc_interface_register(struct class_interface *intf);
-
 #ifdef CONFIG_RTC_INTF_DEV
 
 extern void __init rtc_dev_init(void);
 extern void __exit rtc_dev_exit(void);
+extern void rtc_dev_prepare(struct rtc_device *rtc);
 extern void rtc_dev_add_device(struct rtc_device *rtc);
 extern void rtc_dev_del_device(struct rtc_device *rtc);
 
 #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_prepare(struct rtc_device *rtc)
+{
+}
+
+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
+
+extern void rtc_proc_add_device(struct rtc_device *rtc);
+extern void rtc_proc_del_device(struct rtc_device *rtc);
+
+#else
+
+static inline void rtc_proc_add_device(struct rtc_device *rtc)
+{
+}
+
+static inline void rtc_proc_del_device(struct rtc_device *rtc)
+{
+}
 
 #endif
 
@@ -24,8 +55,16 @@ extern void rtc_sysfs_del_device(struct rtc_device *rtc);
 
 #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