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

Commit 6b8e8282 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds
Browse files

drivers/hwmon/coretemp.c: remove unneeded #ifdef CONFIG_HOTPLUG_CPU 



register_hotcpu_notifier() is designed to make these ifdefs unnecessary.

Cc: Chen Gong <gong.chen@linux.intel.com>
Cc: Rudolf Marek <r.marek@assembler.cz>
Cc: Huaxu Wan <huaxu.wan@intel.com>
Cc: Jean Delvare <khali@linux-fr.org>
Cc: Guenter Roeck <guenter.roeck@ericsson.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f3cffe4d

drivers/hwmon/coretemp.c

+0 −4
Original line number Diff line number Diff line
@@ -480,7 +480,6 @@ static int __cpuinit coretemp_device_add(unsigned int cpu) 
	return err;

}



#ifdef CONFIG_HOTPLUG_CPU

static void coretemp_device_remove(unsigned int cpu)

{

	struct pdev_entry *p, *n;
@@ -518,7 +517,6 @@ static int __cpuinit coretemp_cpu_callback(struct notifier_block *nfb, 
static struct notifier_block coretemp_cpu_notifier __refdata = {

	.notifier_call = coretemp_cpu_callback,

};

#endif				/* !CONFIG_HOTPLUG_CPU */



static int __init coretemp_init(void)

{
@@ -552,9 +550,7 @@ static int __init coretemp_init(void) 
		goto exit_driver_unreg;

	}



#ifdef CONFIG_HOTPLUG_CPU

	register_hotcpu_notifier(&coretemp_cpu_notifier);

#endif

	return 0;



exit_driver_unreg: