diff options
Diffstat (limited to 'arch/i386/oprofile/nmi_int.c')
-rw-r--r-- | arch/i386/oprofile/nmi_int.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/i386/oprofile/nmi_int.c b/arch/i386/oprofile/nmi_int.c index 3700eef78743..8fda7be9dd4d 100644 --- a/arch/i386/oprofile/nmi_int.c +++ b/arch/i386/oprofile/nmi_int.c | |||
@@ -63,7 +63,7 @@ static struct sys_device device_oprofile = { | |||
63 | }; | 63 | }; |
64 | 64 | ||
65 | 65 | ||
66 | static int __init init_driverfs(void) | 66 | static int __init init_sysfs(void) |
67 | { | 67 | { |
68 | int error; | 68 | int error; |
69 | if (!(error = sysdev_class_register(&oprofile_sysclass))) | 69 | if (!(error = sysdev_class_register(&oprofile_sysclass))) |
@@ -72,15 +72,15 @@ static int __init init_driverfs(void) | |||
72 | } | 72 | } |
73 | 73 | ||
74 | 74 | ||
75 | static void exit_driverfs(void) | 75 | static void exit_sysfs(void) |
76 | { | 76 | { |
77 | sysdev_unregister(&device_oprofile); | 77 | sysdev_unregister(&device_oprofile); |
78 | sysdev_class_unregister(&oprofile_sysclass); | 78 | sysdev_class_unregister(&oprofile_sysclass); |
79 | } | 79 | } |
80 | 80 | ||
81 | #else | 81 | #else |
82 | #define init_driverfs() do { } while (0) | 82 | #define init_sysfs() do { } while (0) |
83 | #define exit_driverfs() do { } while (0) | 83 | #define exit_sysfs() do { } while (0) |
84 | #endif /* CONFIG_PM */ | 84 | #endif /* CONFIG_PM */ |
85 | 85 | ||
86 | static int profile_exceptions_notify(struct notifier_block *self, | 86 | static int profile_exceptions_notify(struct notifier_block *self, |
@@ -385,7 +385,7 @@ static int __init ppro_init(char ** cpu_type) | |||
385 | return 1; | 385 | return 1; |
386 | } | 386 | } |
387 | 387 | ||
388 | /* in order to get driverfs right */ | 388 | /* in order to get sysfs right */ |
389 | static int using_nmi; | 389 | static int using_nmi; |
390 | 390 | ||
391 | int __init op_nmi_init(struct oprofile_operations *ops) | 391 | int __init op_nmi_init(struct oprofile_operations *ops) |
@@ -440,7 +440,7 @@ int __init op_nmi_init(struct oprofile_operations *ops) | |||
440 | return -ENODEV; | 440 | return -ENODEV; |
441 | } | 441 | } |
442 | 442 | ||
443 | init_driverfs(); | 443 | init_sysfs(); |
444 | using_nmi = 1; | 444 | using_nmi = 1; |
445 | ops->create_files = nmi_create_files; | 445 | ops->create_files = nmi_create_files; |
446 | ops->setup = nmi_setup; | 446 | ops->setup = nmi_setup; |
@@ -456,5 +456,5 @@ int __init op_nmi_init(struct oprofile_operations *ops) | |||
456 | void op_nmi_exit(void) | 456 | void op_nmi_exit(void) |
457 | { | 457 | { |
458 | if (using_nmi) | 458 | if (using_nmi) |
459 | exit_driverfs(); | 459 | exit_sysfs(); |
460 | } | 460 | } |