Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 6b8e8282611ea35845dcff0cb321a7d735fc3155

Authored by Andrew Morton
Committed by Linus Torvalds
1 parent f3cffe4d1a
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 0 additions and 4 deletions Side-by-side Diff

drivers/hwmon/coretemp.c
Diff comments   View file @ 6b8e828
... ... @@ -480,7 +480,6 @@
480 480 return err;
481 481 }
482 482  
483   -#ifdef CONFIG_HOTPLUG_CPU
484 483 static void coretemp_device_remove(unsigned int cpu)
485 484 {
486 485 struct pdev_entry *p, *n;
... ... @@ -518,7 +517,6 @@
518 517 static struct notifier_block coretemp_cpu_notifier __refdata = {
519 518 .notifier_call = coretemp_cpu_callback,
520 519 };
521   -#endif /* !CONFIG_HOTPLUG_CPU */
522 520  
523 521 static int __init coretemp_init(void)
524 522 {
525 523  
... ... @@ -552,9 +550,7 @@
552 550 goto exit_driver_unreg;
553 551 }
554 552  
555   -#ifdef CONFIG_HOTPLUG_CPU
556 553 register_hotcpu_notifier(&coretemp_cpu_notifier);
557   -#endif
558 554 return 0;
559 555  
560 556 exit_driver_unreg: