lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86: fix style errors in nmi_int.c

Browse Source 
This patch fixes most errors detected by checkpatch.pl.

                                     errors   lines of code   errors/KLOC
arch/x86/oprofile/nmi_int.c (after)       1             461           2.1
arch/x86/oprofile/nmi_int.c (before)     60             477         125.7

No code changed.

size:
   text    data     bss     dec     hex filename
   2675     264     472    3411     d53 nmi_int.o.after
   2675     264     472    3411     d53 nmi_int.o.before

md5sum:
  847aea0cc68fe1a2b5e7019439f3b4dd  nmi_int.o.after
  847aea0cc68fe1a2b5e7019439f3b4dd  nmi_int.o.before

Signed-off-by: Carlos R. Mafra <crmafra@gmail.com>
Reviewed-by: Jesper Juhl <jesper.juhl@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Carlos R. Mafra
2008-01-30 13:32:33 +01:00
committed by Ingo Molnar
parent b506a9d08b
commit b75f53dba8
1 changed files with 96 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
arch/x86/oprofile/nmi_int.c
View File

@@ -41,7 +41,6 @@ static int nmi_suspend(struct sys_device *dev, pm_message_t state)
return 0; return 0;
} }
static int nmi_resume(struct sys_device *dev) static int nmi_resume(struct sys_device *dev)
{ {
if (nmi_enabled == 1) if (nmi_enabled == 1)
@@ -49,29 +48,27 @@ static int nmi_resume(struct sys_device *dev)
return 0; return 0;
} }
static struct sysdev_class oprofile_sysclass = { static struct sysdev_class oprofile_sysclass = {
.name = "oprofile", .name = "oprofile",
.resume = nmi_resume, .resume = nmi_resume,
.suspend = nmi_suspend, .suspend = nmi_suspend,
}; };
static struct sys_device device_oprofile = { static struct sys_device device_oprofile = {
.id = 0, .id = 0,
.cls = &oprofile_sysclass, .cls = &oprofile_sysclass,
}; };
static int __init init_sysfs(void) static int __init init_sysfs(void)
{ {
int error; int error;
if (!(error = sysdev_class_register(&oprofile_sysclass)))
error = sysdev_class_register(&oprofile_sysclass);
if (!error)
error = sysdev_register(&device_oprofile); error = sysdev_register(&device_oprofile);
return error; return error;
} }
static void exit_sysfs(void) static void exit_sysfs(void)
{ {
sysdev_unregister(&device_oprofile); sysdev_unregister(&device_oprofile);
@@ -126,7 +123,6 @@ static void nmi_cpu_save_registers(struct op_msrs * msrs)
} }
} }
static void nmi_save_registers(void *dummy) static void nmi_save_registers(void *dummy)
{ {
int cpu = smp_processor_id(); int cpu = smp_processor_id();
@@ -134,7 +130,6 @@ static void nmi_save_registers(void * dummy)
nmi_cpu_save_registers(msrs); nmi_cpu_save_registers(msrs);
} }
static void free_msrs(void) static void free_msrs(void)
{ {
int i; int i;
@@ -146,7 +141,6 @@ static void free_msrs(void)
} }
} }
static int allocate_msrs(void) static int allocate_msrs(void)
{ {
int success = 1; int success = 1;
@@ -173,7 +167,6 @@ static int allocate_msrs(void)
return success; return success;
} }
static void nmi_cpu_setup(void *dummy) static void nmi_cpu_setup(void *dummy)
{ {
int cpu = smp_processor_id(); int cpu = smp_processor_id();
@@ -199,7 +192,8 @@ static int nmi_setup(void)
if (!allocate_msrs()) if (!allocate_msrs())
return -ENOMEM; return -ENOMEM;
if ((err = register_die_notifier(&profile_exceptions_nb))){ err = register_die_notifier(&profile_exceptions_nb);
if (err) {
free_msrs(); free_msrs();
return err; return err;
} }
@@ -226,7 +220,6 @@ static int nmi_setup(void)
return 0; return 0;
} }
static void nmi_restore_registers(struct op_msrs *msrs) static void nmi_restore_registers(struct op_msrs *msrs)
{ {
unsigned int const nr_ctrs = model->num_counters; unsigned int const nr_ctrs = model->num_counters;
@@ -252,7 +245,6 @@ static void nmi_restore_registers(struct op_msrs * msrs)
} }
} }
static void nmi_cpu_shutdown(void *dummy) static void nmi_cpu_shutdown(void *dummy)
{ {
unsigned int v; unsigned int v;
@@ -271,7 +263,6 @@ static void nmi_cpu_shutdown(void * dummy)
nmi_restore_registers(msrs); nmi_restore_registers(msrs);
} }
static void nmi_shutdown(void) static void nmi_shutdown(void)
{ {
nmi_enabled = 0; nmi_enabled = 0;
@@ -281,34 +272,29 @@ static void nmi_shutdown(void)
free_msrs(); free_msrs();
} }
static void nmi_cpu_start(void *dummy) static void nmi_cpu_start(void *dummy)
{ {
struct op_msrs const *msrs = &cpu_msrs[smp_processor_id()]; struct op_msrs const *msrs = &cpu_msrs[smp_processor_id()];
model->start(msrs); model->start(msrs);
} }
static int nmi_start(void) static int nmi_start(void)
{ {
on_each_cpu(nmi_cpu_start, NULL, 0, 1); on_each_cpu(nmi_cpu_start, NULL, 0, 1);
return 0; return 0;
} }
static void nmi_cpu_stop(void *dummy) static void nmi_cpu_stop(void *dummy)
{ {
struct op_msrs const *msrs = &cpu_msrs[smp_processor_id()]; struct op_msrs const *msrs = &cpu_msrs[smp_processor_id()];
model->stop(msrs); model->stop(msrs);
} }
static void nmi_stop(void) static void nmi_stop(void)
{ {
on_each_cpu(nmi_cpu_stop, NULL, 0, 1); on_each_cpu(nmi_cpu_stop, NULL, 0, 1);
} }
struct op_counter_config counter_config[OP_MAX_COUNTER]; struct op_counter_config counter_config[OP_MAX_COUNTER];
static int nmi_create_files(struct super_block *sb, struct dentry *root) static int nmi_create_files(struct super_block *sb, struct dentry *root)
@@ -373,7 +359,6 @@ static int __init p4_init(char ** cpu_type)
return 0; return 0;
} }
static int __init ppro_init(char **cpu_type) static int __init ppro_init(char **cpu_type)
{ {
__u8 cpu_model = boot_cpu_data.x86_model; __u8 cpu_model = boot_cpu_data.x86_model;
@@ -469,7 +454,6 @@ int __init op_nmi_init(struct oprofile_operations *ops)
return 0; return 0;
} }
void op_nmi_exit(void) void op_nmi_exit(void)
{ {
if (using_nmi) if (using_nmi)