Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

[firefly-linux-kernel-4.4.55.git] / drivers / hwmon / via-cputemp.c

diff --git a/drivers/hwmon/via-cputemp.c b/drivers/hwmon/via-cputemp.c
index 38944e94f65fbd27692100d4d78b2868f13a2982..8df43c51de2c2d14434533cff15bc371f3d3a245 100644 (file)
--- a/drivers/hwmon/via-cputemp.c
+++ b/drivers/hwmon/via-cputemp.c
@@ -319,7 +319,7 @@ static int __init via_cputemp_init(void)
        if (err)
                goto exit;
 
-       get_online_cpus();
+       cpu_notifier_register_begin();
        for_each_online_cpu(i) {
                struct cpuinfo_x86 *c = &cpu_data(i);
 
@@ -339,14 +339,14 @@ static int __init via_cputemp_init(void)
 
 #ifndef CONFIG_HOTPLUG_CPU
        if (list_empty(&pdev_list)) {
-               put_online_cpus();
+               cpu_notifier_register_done();
                err = -ENODEV;
                goto exit_driver_unreg;
        }
 #endif
 
-       register_hotcpu_notifier(&via_cputemp_cpu_notifier);
-       put_online_cpus();
+       __register_hotcpu_notifier(&via_cputemp_cpu_notifier);
+       cpu_notifier_register_done();
        return 0;
 
 #ifndef CONFIG_HOTPLUG_CPU
@@ -361,8 +361,8 @@ static void __exit via_cputemp_exit(void)
 {
        struct pdev_entry *p, *n;
 
-       get_online_cpus();
-       unregister_hotcpu_notifier(&via_cputemp_cpu_notifier);
+       cpu_notifier_register_begin();
+       __unregister_hotcpu_notifier(&via_cputemp_cpu_notifier);
        mutex_lock(&pdev_list_mutex);
        list_for_each_entry_safe(p, n, &pdev_list, list) {
                platform_device_unregister(p->pdev);
@@ -370,7 +370,7 @@ static void __exit via_cputemp_exit(void)
                kfree(p);
        }
        mutex_unlock(&pdev_list_mutex);
-       put_online_cpus();
+       cpu_notifier_register_done();
        platform_driver_unregister(&via_cputemp_driver);
 }