update and cleanup patches for core{pkg, via}temp etc.
Subsystems (2)
[PATCH V2 1/2] hwmon: uniform the init style of pkgtemp [PATCH V2 2/2] hwmon: cleanup some hotplug related macro definition
These 2 patches don't supply new functions, just unify the codes to avoid potential issues and some cleanup work.
V2: fix some compile errors.
PATCH v2 1/2 hwmon: uniform the init style of pkgtemp
pkgtemp is derived from coretemp, so some reasonable logics should be applied onto pkgtemp, too. Such as the init logic here.
--- drivers/hwmon/pkgtemp.c | 22 ++++++++-------------- 1 files changed, 8 insertions(+), 14 deletions(-)
drivers/hwmon/pkgtemp.c +8 -14
@@ -35,6 +35,7 @@#include <linux/cpu.h> #include <asm/msr.h> #include <asm/processor.h> +#include <asm/smp.h> #define DRVNAME "pkgtemp"
@@ -392,7 +393,6 @@ static struct notifier_block pkgtemp_cpu_notifier __refdata = {static int __init pkgtemp_init (void ) {int i, err = -ENODEV ; -struct pdev_entry *p, *n;/* quick check if we run Intel */ if (cpu_data (0 ).x86_vendor !=X86_VENDOR_INTEL )
@@ -402,31 +402,25 @@ static int __init pkgtemp_init(void)if (err) goto exit; -for_each_online_cpu (i) { - err =pkgtemp_device_add (i); -if (err) - goto exit_devices_unreg; - } +for_each_online_cpu (i) +pkgtemp_device_add (i); + +#ifndef CONFIG_HOTPLUG_CPU if (list_empty (&pdev_list)) { err = -ENODEV ; goto exit_driver_unreg; } +#endif #ifdef CONFIG_HOTPLUG_CPU register_hotcpu_notifier (&pkgtemp_cpu_notifier);#endif return 0 ; -exit_devices_unreg: -mutex_lock (&pdev_list_mutex); -list_for_each_entry_safe (p, n, &pdev_list, list) { -platform_device_unregister (p->pdev); -list_del (&p->list); -kfree (p); - } -mutex_unlock (&pdev_list_mutex); +#ifndef CONFIG_HOTPLUG_CPU exit_driver_unreg:platform_driver_unregister (&pkgtemp_driver); +#endif exit:return err; }
Signature · 1 line
1.7.2.2.173.g515cc
Guenter Roeck
AppliedRe: [PATCH V2 1/2] hwmon: uniform the init style of pkgtemp
Quoted 5 lines · Chen Gong
pkgtemp is derived from coretemp, so some reasonable logics should be applied onto pkgtemp, too. Such as the init logic here.
Signed-off-by Chen Gong <[email protected]>
Applied.
_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
PATCH v2 2/2 hwmon: cleanup some hotplug related macro definition
In reply to Chen GongCONFIG_HOTPLUG_CPU is used too much in some drivers. This patch clean them up and add some proper __cpuinit definitons.
--- drivers/hwmon/coretemp.c | 5 ++--- drivers/hwmon/pkgtemp.c | 9 ++------- drivers/hwmon/via-cputemp.c | 9 ++------- 3 files changed, 6 insertions(+), 17 deletions(-)
drivers/hwmon/coretemp.c +2 -3
@@ -490,7 +490,7 @@ exit:return err; } -static void coretemp_device_remove (unsigned int cpu) +static void __cpuinit coretemp_device_remove (unsigned int cpu) {struct pdev_entry *p;unsigned int i;
@@ -569,9 +569,8 @@ exit: static void __exit coretemp_exit(void) {struct pdev_entry *p, *n; -#ifdef CONFIG_HOTPLUG_CPU +unregister_hotcpu_notifier (&coretemp_cpu_notifier); -#endif mutex_lock (&pdev_list_mutex);list_for_each_entry_safe (p, n, &pdev_list, list) {platform_device_unregister (p->pdev);
drivers/hwmon/pkgtemp.c +2 -7
@@ -340,8 +340,7 @@ exit:return err; } -#ifdef CONFIG_HOTPLUG_CPU -static void pkgtemp_device_remove (unsigned int cpu) +static void __cpuinit pkgtemp_device_remove (unsigned int cpu) {struct pdev_entry *p;unsigned int i;
@@ -388,7 +387,6 @@ static int __cpuinit pkgtemp_cpu_callback(struct notifier_block *nfb,static struct notifier_block pkgtemp_cpu_notifier__refdata = { .notifier_call = pkgtemp_cpu_callback, }; -#endif /* !CONFIG_HOTPLUG_CPU */ static int __init pkgtemp_init (void ) {
@@ -412,9 +410,7 @@ static int __init pkgtemp_init(void) }#endif -#ifdef CONFIG_HOTPLUG_CPU register_hotcpu_notifier (&pkgtemp_cpu_notifier); -#endif return 0 ;#ifndef CONFIG_HOTPLUG_CPU
@@ -428,9 +424,8 @@ exit: static void __exit pkgtemp_exit(void) {struct pdev_entry *p, *n; -#ifdef CONFIG_HOTPLUG_CPU +unregister_hotcpu_notifier (&pkgtemp_cpu_notifier); -#endif mutex_lock (&pdev_list_mutex);list_for_each_entry_safe (p, n, &pdev_list, list) {platform_device_unregister (p->pdev);
drivers/hwmon/via-cputemp.c +2 -7
@@ -237,8 +237,7 @@ exit:return err; } -#ifdef CONFIG_HOTPLUG_CPU -static void via_cputemp_device_remove (unsigned int cpu) +static void __cpuinit via_cputemp_device_remove (unsigned int cpu) {struct pdev_entry *p, *n;mutex_lock (&pdev_list_mutex);
@@ -272,7 +271,6 @@ static int __cpuinit via_cputemp_cpu_callback(struct notifier_block *nfb,static struct notifier_block via_cputemp_cpu_notifier__refdata = { .notifier_call = via_cputemp_cpu_callback, }; -#endif /* !CONFIG_HOTPLUG_CPU */ static int __init via_cputemp_init (void ) {
@@ -313,9 +311,7 @@ static int __init via_cputemp_init(void) goto exit_driver_unreg; } -#ifdef CONFIG_HOTPLUG_CPU register_hotcpu_notifier (&via_cputemp_cpu_notifier); -#endif return 0 ; exit_devices_unreg:
@@ -335,9 +331,8 @@ exit: static void __exit via_cputemp_exit(void) {struct pdev_entry *p, *n; -#ifdef CONFIG_HOTPLUG_CPU +unregister_hotcpu_notifier (&via_cputemp_cpu_notifier); -#endif mutex_lock (&pdev_list_mutex);list_for_each_entry_safe (p, n, &pdev_list, list) {platform_device_unregister (p->pdev);
Signature · 1 line
1.7.2.2.173.g515cc
Re: [PATCH V2 2/2] hwmon: cleanup some hotplug related macro definition
Quoted 4 lines · Chen Gong
CONFIG_HOTPLUG_CPUis used too much in some drivers. This patch clean them up and add some proper__cpuinitdefinitons.Signed-off-by Chen Gong <[email protected]>
Please rebase this patch togit://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging.git hwmon-next
Some of the changes are already applied through other patches.
Thanks,
Guenter
_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
the 2nd patch is updated
In reply to Chen GongThis patch is updated based on hwmon-next tree now.
PATCH 1/1 hwmon: cleanup useless hotplug related macro definition
In reply to Chen GongCONFIG_HOTPLUG_CPU is used too much in some drivers. This patch clean them up.
--- drivers/hwmon/coretemp.c | 3 +-- drivers/hwmon/pkgtemp.c | 7 +------ drivers/hwmon/via-cputemp.c | 7 +------ 3 files changed, 3 insertions(+), 14 deletions(-)
drivers/hwmon/coretemp.c +1 -2
@@ -566,9 +566,8 @@ exit: static void __exit coretemp_exit(void) {struct pdev_entry *p, *n; -#ifdef CONFIG_HOTPLUG_CPU +unregister_hotcpu_notifier (&coretemp_cpu_notifier); -#endif mutex_lock (&pdev_list_mutex);list_for_each_entry_safe (p, n, &pdev_list, list) {platform_device_unregister (p->pdev);
drivers/hwmon/pkgtemp.c +1 -6
@@ -339,7 +339,6 @@ exit:return err; } -#ifdef CONFIG_HOTPLUG_CPU static void __cpuinit pkgtemp_device_remove (unsigned int cpu) {struct pdev_entry *p;
@@ -387,7 +386,6 @@ static int __cpuinit pkgtemp_cpu_callback(struct notifier_block *nfb,static struct notifier_block pkgtemp_cpu_notifier__refdata = { .notifier_call = pkgtemp_cpu_callback, }; -#endif /* !CONFIG_HOTPLUG_CPU */ static int __init pkgtemp_init (void ) {
@@ -411,9 +409,7 @@ static int __init pkgtemp_init(void) }#endif -#ifdef CONFIG_HOTPLUG_CPU register_hotcpu_notifier (&pkgtemp_cpu_notifier); -#endif return 0 ;#ifndef CONFIG_HOTPLUG_CPU
@@ -427,9 +423,8 @@ exit: static void __exit pkgtemp_exit(void) {struct pdev_entry *p, *n; -#ifdef CONFIG_HOTPLUG_CPU +unregister_hotcpu_notifier (&pkgtemp_cpu_notifier); -#endif mutex_lock (&pdev_list_mutex);list_for_each_entry_safe (p, n, &pdev_list, list) {platform_device_unregister (p->pdev);
drivers/hwmon/via-cputemp.c +1 -6
@@ -235,7 +235,6 @@ exit:return err; } -#ifdef CONFIG_HOTPLUG_CPU static void __cpuinit via_cputemp_device_remove (unsigned int cpu) {struct pdev_entry *p, *n;
@@ -270,7 +269,6 @@ static int __cpuinit via_cputemp_cpu_callback(struct notifier_block *nfb,static struct notifier_block via_cputemp_cpu_notifier__refdata = { .notifier_call = via_cputemp_cpu_callback, }; -#endif /* !CONFIG_HOTPLUG_CPU */ static int __init via_cputemp_init (void ) {
@@ -311,9 +309,7 @@ static int __init via_cputemp_init(void) goto exit_driver_unreg; } -#ifdef CONFIG_HOTPLUG_CPU register_hotcpu_notifier (&via_cputemp_cpu_notifier); -#endif return 0 ; exit_devices_unreg:
@@ -333,9 +329,8 @@ exit: static void __exit via_cputemp_exit(void) {struct pdev_entry *p, *n; -#ifdef CONFIG_HOTPLUG_CPU +unregister_hotcpu_notifier (&via_cputemp_cpu_notifier); -#endif mutex_lock (&pdev_list_mutex);list_for_each_entry_safe (p, n, &pdev_list, list) {platform_device_unregister (p->pdev);
Signature · 1 line
1.7.2.2.173.g515cc
Guenter Roeck
AppliedRe: [PATCH] hwmon: cleanup useless hotplug related macro definition
Quoted 4 lines · Chen Gong
CONFIG_HOTPLUG_CPUis used too much in some drivers. This patch clean them up.Signed-off-by Chen Gong <[email protected]>
Applied.
Thanks,
Guenter
_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors