The CPU hotplug notifier_block coretemp_cpu_notifier is already defined
inside an #ifdef HOTPLUG_CPU, therefore marking it as __cpuinitdata is
quite a pointless thing to do.
Also, remove duplicate prototype of function coretemp_update_device()
at the top of this file (another one already exists barely 10 lines
above this one :-)
Signed-off-by: Satyam Sharma <[email protected]>
---
[ Rudolf, Mark, would it be acceptable to you to remove all the open
#ifdef HOTPLUG_CPU from this file and replace them with __cpuinit{data}
instead? That could increase size of modular builds, but would remain
consistent with rest of kernel, and make the file #ifdef-clean ... ]
drivers/hwmon/coretemp.c | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
index 7c17952..f7b0ef4 100644
--- a/drivers/hwmon/coretemp.c
+++ b/drivers/hwmon/coretemp.c
@@ -58,8 +58,6 @@ struct coretemp_data {
u8 alarm;
};
-static struct coretemp_data *coretemp_update_device(struct device *dev);
-
/*
* Sysfs stuff
*/
@@ -350,7 +348,7 @@ static int coretemp_cpu_callback(struct notifier_block *nfb,
return NOTIFY_OK;
}
-static struct notifier_block __cpuinitdata coretemp_cpu_notifier = {
+static struct notifier_block coretemp_cpu_notifier = {
.notifier_call = coretemp_cpu_callback,
};
#endif /* !CONFIG_HOTPLUG_CPU */
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi,
> The CPU hotplug notifier_block coretemp_cpu_notifier is already defined
> inside an #ifdef HOTPLUG_CPU, therefore marking it as __cpuinitdata is
> quite a pointless thing to do.
Yep true.
> Also, remove duplicate prototype of function coretemp_update_device()
Good catch. Thanks for the fixes.
Acked-by: Rudolf Marek <[email protected]>
Rudolf
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFGz0wO3J9wPJqZRNURAnerAKDiDMzqqvymSbvVuVzuvA+dkF8p8gCdGyq7
spqOnJ6YD8NxNgTNSBW8okY=
=/u3Y
-----END PGP SIGNATURE-----
Hi Satyam:
* Satyam Sharma <[email protected]> [2007-08-23 09:14:25 +0530]:
>
> The CPU hotplug notifier_block coretemp_cpu_notifier is already defined
> inside an #ifdef HOTPLUG_CPU, therefore marking it as __cpuinitdata is
> quite a pointless thing to do.
>
> Also, remove duplicate prototype of function coretemp_update_device()
> at the top of this file (another one already exists barely 10 lines
> above this one :-)
>
> Signed-off-by: Satyam Sharma <[email protected]>
Applied to hwmon-2.6.git/testing, thanks.
> [ Rudolf, Mark, would it be acceptable to you to remove all the open
> #ifdef HOTPLUG_CPU from this file and replace them with __cpuinit{data}
> instead? That could increase size of modular builds, but would remain
> consistent with rest of kernel, and make the file #ifdef-clean ... ]
I am not automatically repulsed by #ifdefs as some are, and in this case the
usage is pretty clear and easy to read (not to mention useful).
I would prefer to leave it.
> drivers/hwmon/coretemp.c | 4 +---
> 1 files changed, 1 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
> index 7c17952..f7b0ef4 100644
> --- a/drivers/hwmon/coretemp.c
> +++ b/drivers/hwmon/coretemp.c
> @@ -58,8 +58,6 @@ struct coretemp_data {
> u8 alarm;
> };
>
> -static struct coretemp_data *coretemp_update_device(struct device *dev);
> -
> /*
> * Sysfs stuff
> */
> @@ -350,7 +348,7 @@ static int coretemp_cpu_callback(struct notifier_block *nfb,
> return NOTIFY_OK;
> }
>
> -static struct notifier_block __cpuinitdata coretemp_cpu_notifier = {
> +static struct notifier_block coretemp_cpu_notifier = {
> .notifier_call = coretemp_cpu_callback,
> };
> #endif /* !CONFIG_HOTPLUG_CPU */
--
Mark M. Hoffman
[email protected]
>> [ Rudolf, Mark, would it be acceptable to you to remove all the open
>> #ifdef HOTPLUG_CPU from this file and replace them with __cpuinit{data}
>> instead? That could increase size of modular builds, but would remain
>> consistent with rest of kernel, and make the file #ifdef-clean ... ]
Well I dont have any strong preference. I agree with Mark that that #ifdef is
easy to read.
Rudolf