Commit a83048eb authored by Paul Gortmaker's avatar Paul Gortmaker

drivers: delete __cpuinit usage from all remaining drivers 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 remaining one-off uses of the __cpuinit macros
from all C files in the drivers/* directory.

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

Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
parent 0db0628d
...@@ -278,7 +278,7 @@ static void cpu_device_release(struct device *dev) ...@@ -278,7 +278,7 @@ static void cpu_device_release(struct device *dev)
* *
* Initialize and register the CPU device. * Initialize and register the CPU device.
*/ */
int __cpuinit register_cpu(struct cpu *cpu, int num) int register_cpu(struct cpu *cpu, int num)
{ {
int error; int error;
......
...@@ -143,21 +143,21 @@ static struct attribute_group topology_attr_group = { ...@@ -143,21 +143,21 @@ static struct attribute_group topology_attr_group = {
}; };
/* Add/Remove cpu_topology interface for CPU device */ /* Add/Remove cpu_topology interface for CPU device */
static int __cpuinit topology_add_dev(unsigned int cpu) static int topology_add_dev(unsigned int cpu)
{ {
struct device *dev = get_cpu_device(cpu); struct device *dev = get_cpu_device(cpu);
return sysfs_create_group(&dev->kobj, &topology_attr_group); return sysfs_create_group(&dev->kobj, &topology_attr_group);
} }
static void __cpuinit topology_remove_dev(unsigned int cpu) static void topology_remove_dev(unsigned int cpu)
{ {
struct device *dev = get_cpu_device(cpu); struct device *dev = get_cpu_device(cpu);
sysfs_remove_group(&dev->kobj, &topology_attr_group); sysfs_remove_group(&dev->kobj, &topology_attr_group);
} }
static int __cpuinit topology_cpu_callback(struct notifier_block *nfb, static int topology_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;
...@@ -178,7 +178,7 @@ static int __cpuinit topology_cpu_callback(struct notifier_block *nfb, ...@@ -178,7 +178,7 @@ static int __cpuinit topology_cpu_callback(struct notifier_block *nfb,
return notifier_from_errno(rc); return notifier_from_errno(rc);
} }
static int __cpuinit topology_sysfs_init(void) static int topology_sysfs_init(void)
{ {
int cpu; int cpu;
int rc; int rc;
......
...@@ -74,7 +74,7 @@ static void oprofile_hrtimer_stop(void) ...@@ -74,7 +74,7 @@ static void oprofile_hrtimer_stop(void)
put_online_cpus(); put_online_cpus();
} }
static int __cpuinit oprofile_cpu_notify(struct notifier_block *self, static int oprofile_cpu_notify(struct notifier_block *self,
unsigned long action, void *hcpu) unsigned long action, void *hcpu)
{ {
long cpu = (long) hcpu; long cpu = (long) hcpu;
......
...@@ -91,7 +91,7 @@ static int xen_acpi_processor_enable(struct acpi_device *device) ...@@ -91,7 +91,7 @@ static int xen_acpi_processor_enable(struct acpi_device *device)
return 0; return 0;
} }
static int __cpuinit xen_acpi_processor_add(struct acpi_device *device) static int xen_acpi_processor_add(struct acpi_device *device)
{ {
int ret; int ret;
struct acpi_processor *pr; struct acpi_processor *pr;
......
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