update and cleanup patches for coretemp etc.
Subsystems (2)
cover update and cleanup patches for coretemp etc.
[PATCH 1/2] hwmon: uniform the init style of pkgtemp [PATCH 2/2] hwmon: cleanup some hotplug related macro definition
These 2 patches are no new functions, just unify the codes to avoid potential issues and some cleanup work.
PATCH 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 | 23 +++++++---------------- 1 files changed, 7 insertions(+), 16 deletions(-)
drivers/hwmon/pkgtemp.c +7 -16
@@ -392,7 +392,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 +401,23 @@ 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
Re: [PATCH 1/2] hwmon: uniform the init style of pkgtemp
Quoted 6 lines
Quoted 1 line
Quoted 1 line · 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]>
Quoted 46 lines
--- drivers/hwmon/pkgtemp.c | 23 +++++++---------------- 1 files changed, 7 insertions(+), 16 deletions(-)drivers/hwmon/pkgtemp.c +0
-1@@ -392,7 +392,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 */ drivers/hwmon/pkgtemp.c +5
-12if (cpu_data (0 ).x86_vendor !=X86_VENDOR_INTEL )@@ -402,31 +401,23 @@ 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);
drivers/hwmon/pkgtemp.c static int __init pkgtemp_init(void) · line 423
Quoted 10 lines
drivers/hwmon/pkgtemp.c +2
-3-kfree (p); - } -mutex_unlock (&pdev_list_mutex); +#ifndef CONFIG_HOTPLUG_CPU exit_driver_unreg:platform_driver_unregister (&pkgtemp_driver); +#endif exit:return err; }
_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
Re: [lm-sensors] [PATCH 1/2] hwmon: uniform the init style of pkgtemp
Quoted 9 lines · Jan Beulich
Quoted 6 lines
Quoted 1 line
Quoted 1 line · 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]>Acked-by Jan Beulich <[email protected]>
Applied to.
Thanks,
Guenter
_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
Re: [1/2] hwmon: uniform the init style of pkgtemp
In reply to Chen GongQuoted 7 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]>Acked-by Jan Beulich <[email protected]>
Hi,
this patch, when applied with CONFIG_HOTPLUG_CPU undefined, causes a compile failure because it tries to access pkgtemp_cpu_notifier which is not defined in this case.
For that reason, I have removed the patch from the list of applied patches for -next. Please re-submit a version which compiles for all combinations of HOTPLUG_CPU and SMP defined/undefined.
Thanks,
Guenter
_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
Re: [1/2] hwmon: uniform the init style of pkgtemp
Quoted 13 lines · Guenter Roeck
Quoted 7 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]>Acked-by Jan Beulich<[email protected]>Hi,
this patch, when applied with
CONFIG_HOTPLUG_CPUundefined, causes a compile failure because it tries to accesspkgtemp_cpu_notifierwhich is not defined in this case.
Quoted 7 lines
For that reason, I have removed the patch from the list of applied patches for -next. Please re-submit a version which compiles for all combinations of
HOTPLUG_CPUand SMP defined/undefined.Thanks,
Guenter
Sorry for late. I just come back from my holiday. If only this one patch is applied, it is broken, but it will be OK after these 2 patches are applied. I tested the patches when CONFIG_SMP is undefined, it does be broken again. My suggestion is adding a macro definiton in the pkgtemp.c like "#include <asm/smp.h>". If it is doable, I will re-post a new patch series
Re: [1/2] hwmon: uniform the init style of pkgtemp
Quoted 18 lines · Chen Gong
Quoted 17 lines · Guenter Roeck
Quoted 7 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]>Acked-by Jan Beulich<[email protected]>Hi,
this patch, when applied with
CONFIG_HOTPLUG_CPUundefined, causes a compile failure because it tries to accesspkgtemp_cpu_notifierwhich is not defined in this case.For that reason, I have removed the patch from the list of applied patches for -next. Please re-submit a version which compiles for all combinations of
HOTPLUG_CPUand SMP defined/undefined.
Quoted 6 lines
Quoted 3 lines
Thanks,
GuenterSorry for late. I just come back from my holiday. If only this one patch is applied, it is broken, but it will be OK after these 2 patches are applied. I tested the patches when
CONFIG_SMPis undefined, it does be
Each patch by itself must be compilable, otherwise we break the ability to bisect. Not a good idea.
Quoted 3 lines
broken again. My suggestion is adding a macro definiton in the
pkgtemp.clike "#include <asm/smp.h>". If it is doable, I will re-post a new patch series
I assume you mean to add the include directive. Yes, that should do it, but please make sure that it compiles.
Thanks,
Guenter
_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
Re: [1/2] hwmon: uniform the init style of pkgtemp
Quoted 22 lines · Guenter Roeck
Quoted 21 lines · Chen Gong
Quoted 20 lines · Guenter Roeck
Quoted 7 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]>Acked-by Jan Beulich<[email protected]>Hi,
this patch, when applied with
CONFIG_HOTPLUG_CPUundefined, causes a compile failure because it tries to accesspkgtemp_cpu_notifierwhich is not defined in this case.For that reason, I have removed the patch from the list of applied patches for -next. Please re-submit a version which compiles for all combinations of
HOTPLUG_CPUand SMP defined/undefined.Thanks,
Guenter
Quoted 6 lines
Quoted 3 lines
Sorry for late. I just come back from my holiday. If only this one patch is applied, it is broken, but it will be OK after these 2 patches are applied. I tested the patches when
CONFIG_SMPis undefined, it does beEach patch by itself must be compilable, otherwise we break the ability to bisect. Not a good idea.
Yes, but in fact it is an existing issue, not new incoming. The 1st patch isn't used for this purpose.
Quoted 7 lines
Quoted 4 lines
broken again. My suggestion is adding a macro definiton in the
pkgtemp.clike "#include<asm/smp.h>". If it is doable, I will re-post a new patch seriesI assume you mean to add the include directive. Yes, that should do it, but please make sure that it compiles.
Sure, of course
Quoted 4 lines
Thanks,
Guenter
PATCH 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 | 7 ++----- drivers/hwmon/via-cputemp.c | 9 ++------- 3 files changed, 6 insertions(+), 15 deletions(-)
drivers/hwmon/coretemp.c +2 -3
@@ -489,7 +489,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;
@@ -568,9 +568,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 -5
@@ -339,8 +339,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;
@@ -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 ) {
@@ -425,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 +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 2/2] hwmon: cleanup some hotplug related macro definition
Quoted 5 lines
Quoted 1 line
Quoted 1 line · 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]>
Quoted 98 lines
--- drivers/hwmon/coretemp.c | 5 ++--- drivers/hwmon/pkgtemp.c | 7 ++----- drivers/hwmon/via-cputemp.c | 9 ++------- 3 files changed, 6 insertions(+), 15 deletions(-)drivers/hwmon/coretemp.c +2
-3@@ -489,7 +489,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;@@ -568,9 +568,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
-3@@ -339,8 +339,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;@@ -387,7 +386,6 @@ static int __cpuinit pkgtemp_cpu_callback(structnotifier_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 ){
drivers/hwmon/pkgtemp.c +1
-2@@ -425,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
-3@@ -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(structnotifier_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 ){
drivers/hwmon/via-cputemp.c +0
-2@@ -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:
drivers/hwmon/via-cputemp.c exit: · line 338
Quoted 10 lines
drivers/hwmon/via-cputemp.c +1
-2@@ -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);
_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
Re: [2/2] hwmon: cleanup some hotplug related macro definition
In reply to Chen GongQuoted 6 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]>Acked-by Jan Beulich <[email protected]>
I am ok with the changes. However, they interfer with other changes made by Jan earlier, which I already applied.
It would be great if you can rebase this patch to
git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging.git hwmon-next
That would help me a lot.
Thanks,
Guenter
Quoted 96 lines
---
drivers/hwmon/coretemp.c| 5 ++---drivers/hwmon/pkgtemp.c | 7 ++----- drivers/hwmon/via-cputemp.c | 9 ++------- 3 files changed, 6 insertions(+), 15 deletions(-)drivers/hwmon/coretemp.c +2
-3@@ -489,7 +489,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;@@ -568,9 +568,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
-5@@ -339,8 +339,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;@@ -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 ) {@@ -425,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
-5@@ -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:
drivers/hwmon/via-cputemp.c exit: · line 338
Quoted 10 lines
drivers/hwmon/via-cputemp.c +1
-2@@ -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);
_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
Re: [2/2] hwmon: cleanup some hotplug related macro definition
In reply to Chen GongQuoted 6 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]>Acked-by Jan Beulich <[email protected]>
Hi,
this patch fails to compile if SMP is undefined. For this reason, I have removed it from the list of patches applied for -next.
Please re-submit a corrected version.
Thanks,
Guenter
_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors