Merge branches 'doc', 'multitouch', 'upstream' and 'upstream-fixes' into for-linus

[pandora-kernel.git] / drivers / oprofile / oprofile_perf.c

diff --git a/drivers/oprofile/oprofile_perf.c b/drivers/oprofile/oprofile_perf.c
index e707a72..9046f7b 100644 (file)
--- a/drivers/oprofile/oprofile_perf.c
+++ b/drivers/oprofile/oprofile_perf.c
@@ -190,6 +190,7 @@ static void oprofile_perf_stop(void)
 }
 
 #ifdef CONFIG_PM
+
 static int oprofile_perf_suspend(struct platform_device *dev, pm_message_t state)
 {
        mutex_lock(&oprofile_perf_mutex);
@@ -236,14 +237,17 @@ static int __init init_driverfs(void)
        return ret;
 }
 
-static void __exit exit_driverfs(void)
+static void exit_driverfs(void)
 {
        platform_device_unregister(oprofile_pdev);
        platform_driver_unregister(&oprofile_driver);
 }
+
 #else
-static int __init init_driverfs(void) { return 0; }
-#define exit_driverfs() do { } while (0)
+
+static inline int  init_driverfs(void) { return 0; }
+static inline void exit_driverfs(void) { }
+
 #endif /* CONFIG_PM */
 
 void oprofile_perf_exit(void)