Skip to content

L
linux
Commit d23e2ae1 authored by Paul Gortmaker's avatar Paul Gortmaker
Browse files
Options

hwmon: delete __cpuinit usage from all hwmon files 

The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications.  For example, the fix in
commit 5e427ec2 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.

After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out.  Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.

This removes all the drivers/hwmon uses of the __cpuinit macros
from all C files.

[1] https://lkml.org/lkml/2013/5/20/589

Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: lm-sensors@lm-sensors.org
Acked-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
parent 2760984f
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 25 deletions
drivers/hwmon/coretemp.c
View file @ d23e2ae1
...@@ -195,7 +195,7 @@ struct tjmax { ...@@ -195,7 +195,7 @@ struct tjmax {
int tjmax; int tjmax;
}; };
static const struct tjmax __cpuinitconst tjmax_table[] = { static const struct tjmax tjmax_table[] = {
{ "CPU 230", 100000 }, /* Model 0x1c, stepping 2 */ { "CPU 230", 100000 }, /* Model 0x1c, stepping 2 */
{ "CPU 330", 125000 }, /* Model 0x1c, stepping 2 */ { "CPU 330", 125000 }, /* Model 0x1c, stepping 2 */
{ "CPU CE4110", 110000 }, /* Model 0x1c, stepping 10 Sodaville */ { "CPU CE4110", 110000 }, /* Model 0x1c, stepping 10 Sodaville */
...@@ -211,7 +211,7 @@ struct tjmax_model { ...@@ -211,7 +211,7 @@ struct tjmax_model {
#define ANY 0xff #define ANY 0xff
static const struct tjmax_model __cpuinitconst tjmax_model_table[] = { static const struct tjmax_model tjmax_model_table[] = {
{ 0x1c, 10, 100000 }, /* D4xx, K4xx, N4xx, D5xx, K5xx, N5xx */ { 0x1c, 10, 100000 }, /* D4xx, K4xx, N4xx, D5xx, K5xx, N5xx */
{ 0x1c, ANY, 90000 }, /* Z5xx, N2xx, possibly others { 0x1c, ANY, 90000 }, /* Z5xx, N2xx, possibly others
* Note: Also matches 230 and 330, * Note: Also matches 230 and 330,
...@@ -226,8 +226,7 @@ static const struct tjmax_model __cpuinitconst tjmax_model_table[] = { ...@@ -226,8 +226,7 @@ static const struct tjmax_model __cpuinitconst tjmax_model_table[] = {
{ 0x36, ANY, 100000 }, /* Atom Cedar Trail/Cedarview (N2xxx, D2xxx) */ { 0x36, ANY, 100000 }, /* Atom Cedar Trail/Cedarview (N2xxx, D2xxx) */
}; };
static int __cpuinit adjust_tjmax(struct cpuinfo_x86 *c, u32 id, static int adjust_tjmax(struct cpuinfo_x86 *c, u32 id, struct device *dev)
struct device *dev)
{ {
/* The 100C is default for both mobile and non mobile CPUs */ /* The 100C is default for both mobile and non mobile CPUs */
...@@ -317,8 +316,7 @@ static int __cpuinit adjust_tjmax(struct cpuinfo_x86 *c, u32 id, ...@@ -317,8 +316,7 @@ static int __cpuinit adjust_tjmax(struct cpuinfo_x86 *c, u32 id,
return tjmax; return tjmax;
} }
static int __cpuinit get_tjmax(struct cpuinfo_x86 *c, u32 id, static int get_tjmax(struct cpuinfo_x86 *c, u32 id, struct device *dev)
struct device *dev)
{ {
int err; int err;
u32 eax, edx; u32 eax, edx;
...@@ -367,8 +365,8 @@ static int create_name_attr(struct platform_data *pdata, ...@@ -367,8 +365,8 @@ static int create_name_attr(struct platform_data *pdata,
return device_create_file(dev, &pdata->name_attr); return device_create_file(dev, &pdata->name_attr);
} }
static int __cpuinit create_core_attrs(struct temp_data *tdata, static int create_core_attrs(struct temp_data *tdata, struct device *dev,
struct device *dev, int attr_no) int attr_no)
{ {
int err, i; int err, i;
static ssize_t (*const rd_ptr[TOTAL_ATTRS]) (struct device *dev, static ssize_t (*const rd_ptr[TOTAL_ATTRS]) (struct device *dev,
...@@ -401,7 +399,7 @@ static int __cpuinit create_core_attrs(struct temp_data *tdata, ...@@ -401,7 +399,7 @@ static int __cpuinit create_core_attrs(struct temp_data *tdata,
} }
static int __cpuinit chk_ucode_version(unsigned int cpu) static int chk_ucode_version(unsigned int cpu)
{ {
struct cpuinfo_x86 *c = &cpu_data(cpu); struct cpuinfo_x86 *c = &cpu_data(cpu);
...@@ -417,7 +415,7 @@ static int __cpuinit chk_ucode_version(unsigned int cpu) ...@@ -417,7 +415,7 @@ static int __cpuinit chk_ucode_version(unsigned int cpu)
return 0; return 0;
} }
static struct platform_device __cpuinit *coretemp_get_pdev(unsigned int cpu) static struct platform_device *coretemp_get_pdev(unsigned int cpu)
{ {
u16 phys_proc_id = TO_PHYS_ID(cpu); u16 phys_proc_id = TO_PHYS_ID(cpu);
struct pdev_entry *p; struct pdev_entry *p;
...@@ -434,8 +432,7 @@ static struct platform_device __cpuinit *coretemp_get_pdev(unsigned int cpu) ...@@ -434,8 +432,7 @@ static struct platform_device __cpuinit *coretemp_get_pdev(unsigned int cpu)
return NULL; return NULL;
} }
static struct temp_data __cpuinit *init_temp_data(unsigned int cpu, static struct temp_data *init_temp_data(unsigned int cpu, int pkg_flag)
int pkg_flag)
{ {
struct temp_data *tdata; struct temp_data *tdata;
...@@ -453,8 +450,8 @@ static struct temp_data __cpuinit *init_temp_data(unsigned int cpu, ...@@ -453,8 +450,8 @@ static struct temp_data __cpuinit *init_temp_data(unsigned int cpu,
return tdata; return tdata;
} }
static int __cpuinit create_core_data(struct platform_device *pdev, static int create_core_data(struct platform_device *pdev, unsigned int cpu,
unsigned int cpu, int pkg_flag) int pkg_flag)
{ {
struct temp_data *tdata; struct temp_data *tdata;
struct platform_data *pdata = platform_get_drvdata(pdev); struct platform_data *pdata = platform_get_drvdata(pdev);
...@@ -524,7 +521,7 @@ static int __cpuinit create_core_data(struct platform_device *pdev, ...@@ -524,7 +521,7 @@ static int __cpuinit create_core_data(struct platform_device *pdev,
return err; return err;
} }
static void __cpuinit coretemp_add_core(unsigned int cpu, int pkg_flag) static void coretemp_add_core(unsigned int cpu, int pkg_flag)
{ {
struct platform_device *pdev = coretemp_get_pdev(cpu); struct platform_device *pdev = coretemp_get_pdev(cpu);
int err; int err;
...@@ -607,7 +604,7 @@ static struct platform_driver coretemp_driver = { ...@@ -607,7 +604,7 @@ static struct platform_driver coretemp_driver = {
.remove = coretemp_remove, .remove = coretemp_remove,
}; };
static int __cpuinit coretemp_device_add(unsigned int cpu) static int coretemp_device_add(unsigned int cpu)
{ {
int err; int err;
struct platform_device *pdev; struct platform_device *pdev;
...@@ -651,7 +648,7 @@ static int __cpuinit coretemp_device_add(unsigned int cpu) ...@@ -651,7 +648,7 @@ static int __cpuinit coretemp_device_add(unsigned int cpu)
return err; return err;
} }
static void __cpuinit coretemp_device_remove(unsigned int cpu) static void coretemp_device_remove(unsigned int cpu)
{ {
struct pdev_entry *p, *n; struct pdev_entry *p, *n;
u16 phys_proc_id = TO_PHYS_ID(cpu); u16 phys_proc_id = TO_PHYS_ID(cpu);
...@@ -667,7 +664,7 @@ static void __cpuinit coretemp_device_remove(unsigned int cpu) ...@@ -667,7 +664,7 @@ static void __cpuinit coretemp_device_remove(unsigned int cpu)
mutex_unlock(&pdev_list_mutex); mutex_unlock(&pdev_list_mutex);
} }
static bool __cpuinit is_any_core_online(struct platform_data *pdata) static bool is_any_core_online(struct platform_data *pdata)
{ {
int i; int i;
...@@ -681,7 +678,7 @@ static bool __cpuinit is_any_core_online(struct platform_data *pdata) ...@@ -681,7 +678,7 @@ static bool __cpuinit is_any_core_online(struct platform_data *pdata)
return false; return false;
} }
static void __cpuinit get_core_online(unsigned int cpu) static void get_core_online(unsigned int cpu)
{ {
struct cpuinfo_x86 *c = &cpu_data(cpu); struct cpuinfo_x86 *c = &cpu_data(cpu);
struct platform_device *pdev = coretemp_get_pdev(cpu); struct platform_device *pdev = coretemp_get_pdev(cpu);
...@@ -723,7 +720,7 @@ static void __cpuinit get_core_online(unsigned int cpu) ...@@ -723,7 +720,7 @@ static void __cpuinit get_core_online(unsigned int cpu)
coretemp_add_core(cpu, 0); coretemp_add_core(cpu, 0);
} }
static void __cpuinit put_core_offline(unsigned int cpu) static void put_core_offline(unsigned int cpu)
{ {
int i, indx; int i, indx;
struct platform_data *pdata; struct platform_data *pdata;
...@@ -771,7 +768,7 @@ static void __cpuinit put_core_offline(unsigned int cpu) ...@@ -771,7 +768,7 @@ static void __cpuinit put_core_offline(unsigned int cpu)
coretemp_device_remove(cpu); coretemp_device_remove(cpu);
} }
static int __cpuinit coretemp_cpu_callback(struct notifier_block *nfb, static int coretemp_cpu_callback(struct notifier_block *nfb,
unsigned long action, void *hcpu) unsigned long action, void *hcpu)
{ {
unsigned int cpu = (unsigned long) hcpu; unsigned int cpu = (unsigned long) hcpu;
......
drivers/hwmon/via-cputemp.c
View file @ d23e2ae1
...@@ -221,7 +221,7 @@ struct pdev_entry { ...@@ -221,7 +221,7 @@ struct pdev_entry {
static LIST_HEAD(pdev_list); static LIST_HEAD(pdev_list);
static DEFINE_MUTEX(pdev_list_mutex); static DEFINE_MUTEX(pdev_list_mutex);
static int __cpuinit via_cputemp_device_add(unsigned int cpu) static int via_cputemp_device_add(unsigned int cpu)
{ {
int err; int err;
struct platform_device *pdev; struct platform_device *pdev;
...@@ -262,7 +262,7 @@ static int __cpuinit via_cputemp_device_add(unsigned int cpu) ...@@ -262,7 +262,7 @@ static int __cpuinit via_cputemp_device_add(unsigned int cpu)
return err; return err;
} }
static void __cpuinit via_cputemp_device_remove(unsigned int cpu) static void via_cputemp_device_remove(unsigned int cpu)
{ {
struct pdev_entry *p; struct pdev_entry *p;
...@@ -279,8 +279,8 @@ static void __cpuinit via_cputemp_device_remove(unsigned int cpu) ...@@ -279,8 +279,8 @@ static void __cpuinit via_cputemp_device_remove(unsigned int cpu)
mutex_unlock(&pdev_list_mutex); mutex_unlock(&pdev_list_mutex);
} }
static int __cpuinit via_cputemp_cpu_callback(struct notifier_block *nfb, static int via_cputemp_cpu_callback(struct notifier_block *nfb,
unsigned long action, void *hcpu) unsigned long action, void *hcpu)
{ {
unsigned int cpu = (unsigned long) hcpu; unsigned int cpu = (unsigned long) hcpu;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7