summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Beulich <jbeulich@novell.com>2010-09-24 07:31:10 +0200
committerGuenter Roeck <guenter.roeck@ericsson.com>2010-10-25 23:11:19 +0200
commita5f42a6bc51454137b918f67310168c27d1dd1de (patch)
tree4715dd8a2aae7f1345dcf8d8f16153a5bb8eacc5
parentMerge branch 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... (diff)
downloadlinux-a5f42a6bc51454137b918f67310168c27d1dd1de.tar.xz
linux-a5f42a6bc51454137b918f67310168c27d1dd1de.zip
x86/hwmon: {core, pkg, via}cpu_temp_device_remove() can all be __cpuinit
... as they're being called only from a __cpuinit function. Signed-off-by: Jan Beulich <jbeulich@novell.com> Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
-rw-r--r--drivers/hwmon/coretemp.c2
-rw-r--r--drivers/hwmon/pkgtemp.c2
-rw-r--r--drivers/hwmon/via-cputemp.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
index a23b17a78ace..f34fe836b5c9 100644
--- a/drivers/hwmon/coretemp.c
+++ b/drivers/hwmon/coretemp.c
@@ -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;
diff --git a/drivers/hwmon/pkgtemp.c b/drivers/hwmon/pkgtemp.c
index f11903936c8b..db5352c20946 100644
--- a/drivers/hwmon/pkgtemp.c
+++ b/drivers/hwmon/pkgtemp.c
@@ -340,7 +340,7 @@ exit:
}
#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;
diff --git a/drivers/hwmon/via-cputemp.c b/drivers/hwmon/via-cputemp.c
index ffb793af680b..497bd231e241 100644
--- a/drivers/hwmon/via-cputemp.c
+++ b/drivers/hwmon/via-cputemp.c
@@ -238,7 +238,7 @@ exit:
}
#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);