Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b75f53db authored by Carlos R. Mafra's avatar Carlos R. Mafra Committed by Ingo Molnar
Browse files

x86: fix style errors in nmi_int.c 



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: default avatarCarlos R. Mafra <crmafra@gmail.com>
Reviewed-by: default avatarJesper Juhl <jesper.juhl@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent b506a9d0

arch/x86/oprofile/nmi_int.c

+98 −114
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ static int nmi_suspend(struct sys_device *dev, pm_message_t state) 
	return 0;

}





static int nmi_resume(struct sys_device *dev)

{

	if (nmi_enabled == 1)
@@ -49,29 +48,27 @@ static int nmi_resume(struct sys_device *dev) 
	return 0;

}





static struct sysdev_class oprofile_sysclass = {

	.name		= "oprofile",

	.resume		= nmi_resume,

	.suspend	= nmi_suspend,

};





static struct sys_device device_oprofile = {

	.id	= 0,

	.cls	= &oprofile_sysclass,

};





static int __init init_sysfs(void)

{

	int error;

	if (!(error = sysdev_class_register(&oprofile_sysclass)))



	error = sysdev_class_register(&oprofile_sysclass);

	if (!error)

		error = sysdev_register(&device_oprofile);

	return error;

}





static void exit_sysfs(void)

{

	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)

{

	int cpu = smp_processor_id();
@@ -134,7 +130,6 @@ static void nmi_save_registers(void * dummy) 
	nmi_cpu_save_registers(msrs);

}





static void free_msrs(void)

{

	int i;
@@ -146,7 +141,6 @@ static void free_msrs(void) 
	}

}





static int allocate_msrs(void)

{

	int success = 1;
@@ -173,7 +167,6 @@ static int allocate_msrs(void) 
	return success;

}





static void nmi_cpu_setup(void *dummy)

{

	int cpu = smp_processor_id();
@@ -199,7 +192,8 @@ static int nmi_setup(void) 
	if (!allocate_msrs())

		return -ENOMEM;



	if ((err = register_die_notifier(&profile_exceptions_nb))){

	err = register_die_notifier(&profile_exceptions_nb);

	if (err) {

		free_msrs();

		return err;

	}
@@ -226,7 +220,6 @@ static int nmi_setup(void) 
	return 0;

}





static void nmi_restore_registers(struct op_msrs *msrs)

{

	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)

{

	unsigned int v;
@@ -271,7 +263,6 @@ static void nmi_cpu_shutdown(void * dummy) 
	nmi_restore_registers(msrs);

}



 

static void nmi_shutdown(void)

{

	nmi_enabled = 0;
@@ -281,34 +272,29 @@ static void nmi_shutdown(void) 
	free_msrs();

}



 

static void nmi_cpu_start(void *dummy)

{

	struct op_msrs const *msrs = &cpu_msrs[smp_processor_id()];

	model->start(msrs);

}





static int nmi_start(void)

{

	on_each_cpu(nmi_cpu_start, NULL, 0, 1);

	return 0;

}



 

static void nmi_cpu_stop(void *dummy)

{

	struct op_msrs const *msrs = &cpu_msrs[smp_processor_id()];

	model->stop(msrs);

}



 

static void nmi_stop(void)

{

	on_each_cpu(nmi_cpu_stop, NULL, 0, 1);

}





struct op_counter_config counter_config[OP_MAX_COUNTER];



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;

}





static int __init ppro_init(char **cpu_type)

{

	__u8 cpu_model = boot_cpu_data.x86_model;
@@ -469,7 +454,6 @@ int __init op_nmi_init(struct oprofile_operations *ops) 
	return 0;

}





void op_nmi_exit(void)

{

	if (using_nmi)