aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/oprofile/oprof.c
diff options
context:
space:
mode:
authorRobert Richter <robert.richter@amd.com>2011-10-14 09:46:10 -0400
committerRobert Richter <robert.richter@amd.com>2011-11-04 10:04:35 -0400
commit75c43a20b220f885c39ffa7cdbbb1191e257a9a9 (patch)
treea623847b0235f618438b03785b4860a80e0d4b1b /drivers/oprofile/oprof.c
parent159a80b2142df709416ab369113de7d511c48331 (diff)
oprofile: Remove exit function for timer mode
Remove exit functions by moving init/exit code to oprofile's setup/ shutdown functions. Doing so the oprofile module exit code will be easier and less error-prone. Signed-off-by: Robert Richter <robert.richter@amd.com>
Diffstat (limited to 'drivers/oprofile/oprof.c')
-rw-r--r--drivers/oprofile/oprof.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/oprofile/oprof.c b/drivers/oprofile/oprof.c
index f8c752e408a6..f7cd06967aed 100644
--- a/drivers/oprofile/oprof.c
+++ b/drivers/oprofile/oprof.c
@@ -262,9 +262,7 @@ static int __init oprofile_init(void)
262 return 0; 262 return 0;
263 263
264 /* failed */ 264 /* failed */
265 if (timer_mode) 265 if (!timer_mode)
266 oprofile_timer_exit();
267 else
268 oprofile_arch_exit(); 266 oprofile_arch_exit();
269 267
270 return err; 268 return err;
@@ -274,9 +272,7 @@ static int __init oprofile_init(void)
274static void __exit oprofile_exit(void) 272static void __exit oprofile_exit(void)
275{ 273{
276 oprofilefs_unregister(); 274 oprofilefs_unregister();
277 if (timer_mode) 275 if (!timer_mode)
278 oprofile_timer_exit();
279 else
280 oprofile_arch_exit(); 276 oprofile_arch_exit();
281} 277}
282 278