diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-12-21 17:02:24 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-03 18:57:04 -0500 |
| commit | 351a102dbf489d0e9c9b0883f76e2a94d895503d (patch) | |
| tree | 7b7e63506fa400a5e25671649122c5d5060cbede /arch/arm/kernel/perf_event_cpu.c | |
| parent | 3d68dfe32472fc74cabaa576feb69c3e03f9d4cf (diff) | |
ARM: drivers: remove __dev* attributes.
CONFIG_HOTPLUG is going away as an option. As a result, the __dev*
markings need to be removed.
This change removes the use of __devinit, __devexit_p, __devinitdata,
and __devexit from these drivers.
Based on patches originally written by Bill Pemberton, but redone by me
in order to handle some of the coding style issues better, by hand.
Cc: Bill Pemberton <wfp5p@virginia.edu>
Cc: Russell King <linux@arm.linux.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/kernel/perf_event_cpu.c')
| -rw-r--r-- | arch/arm/kernel/perf_event_cpu.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/kernel/perf_event_cpu.c b/arch/arm/kernel/perf_event_cpu.c index 9a4f6307a016..5f6620684e25 100644 --- a/arch/arm/kernel/perf_event_cpu.c +++ b/arch/arm/kernel/perf_event_cpu.c | |||
| @@ -132,7 +132,7 @@ static int cpu_pmu_request_irq(struct arm_pmu *cpu_pmu, irq_handler_t handler) | |||
| 132 | return 0; | 132 | return 0; |
| 133 | } | 133 | } |
| 134 | 134 | ||
| 135 | static void __devinit cpu_pmu_init(struct arm_pmu *cpu_pmu) | 135 | static void cpu_pmu_init(struct arm_pmu *cpu_pmu) |
| 136 | { | 136 | { |
| 137 | int cpu; | 137 | int cpu; |
| 138 | for_each_possible_cpu(cpu) { | 138 | for_each_possible_cpu(cpu) { |
| @@ -178,7 +178,7 @@ static struct notifier_block __cpuinitdata cpu_pmu_hotplug_notifier = { | |||
| 178 | /* | 178 | /* |
| 179 | * PMU platform driver and devicetree bindings. | 179 | * PMU platform driver and devicetree bindings. |
| 180 | */ | 180 | */ |
| 181 | static struct of_device_id __devinitdata cpu_pmu_of_device_ids[] = { | 181 | static struct of_device_id cpu_pmu_of_device_ids[] = { |
| 182 | {.compatible = "arm,cortex-a15-pmu", .data = armv7_a15_pmu_init}, | 182 | {.compatible = "arm,cortex-a15-pmu", .data = armv7_a15_pmu_init}, |
| 183 | {.compatible = "arm,cortex-a9-pmu", .data = armv7_a9_pmu_init}, | 183 | {.compatible = "arm,cortex-a9-pmu", .data = armv7_a9_pmu_init}, |
| 184 | {.compatible = "arm,cortex-a8-pmu", .data = armv7_a8_pmu_init}, | 184 | {.compatible = "arm,cortex-a8-pmu", .data = armv7_a8_pmu_init}, |
| @@ -190,7 +190,7 @@ static struct of_device_id __devinitdata cpu_pmu_of_device_ids[] = { | |||
| 190 | {}, | 190 | {}, |
| 191 | }; | 191 | }; |
| 192 | 192 | ||
| 193 | static struct platform_device_id __devinitdata cpu_pmu_plat_device_ids[] = { | 193 | static struct platform_device_id cpu_pmu_plat_device_ids[] = { |
| 194 | {.name = "arm-pmu"}, | 194 | {.name = "arm-pmu"}, |
| 195 | {}, | 195 | {}, |
| 196 | }; | 196 | }; |
| @@ -198,7 +198,7 @@ static struct platform_device_id __devinitdata cpu_pmu_plat_device_ids[] = { | |||
| 198 | /* | 198 | /* |
| 199 | * CPU PMU identification and probing. | 199 | * CPU PMU identification and probing. |
| 200 | */ | 200 | */ |
| 201 | static int __devinit probe_current_pmu(struct arm_pmu *pmu) | 201 | static int probe_current_pmu(struct arm_pmu *pmu) |
| 202 | { | 202 | { |
| 203 | int cpu = get_cpu(); | 203 | int cpu = get_cpu(); |
| 204 | unsigned long cpuid = read_cpuid_id(); | 204 | unsigned long cpuid = read_cpuid_id(); |
| @@ -252,7 +252,7 @@ static int __devinit probe_current_pmu(struct arm_pmu *pmu) | |||
| 252 | return ret; | 252 | return ret; |
| 253 | } | 253 | } |
| 254 | 254 | ||
| 255 | static int __devinit cpu_pmu_device_probe(struct platform_device *pdev) | 255 | static int cpu_pmu_device_probe(struct platform_device *pdev) |
| 256 | { | 256 | { |
| 257 | const struct of_device_id *of_id; | 257 | const struct of_device_id *of_id; |
| 258 | int (*init_fn)(struct arm_pmu *); | 258 | int (*init_fn)(struct arm_pmu *); |
