|
6 | 6 | * Copyright (C) 2001, 2002 Paul Diefenbaugh <paul.s.diefenbaugh@intel.com> |
7 | 7 | * Copyright (C) 2004 Dominik Brodowski <linux@brodo.de> |
8 | 8 | * Copyright (C) 2004 Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com> |
9 | | - * - Added processor hotplug support |
| 9 | + * - Added processor hotplug support |
10 | 10 | */ |
11 | 11 |
|
12 | 12 | #include <linux/kernel.h> |
@@ -195,15 +195,13 @@ void acpi_processor_throttling_init(void) |
195 | 195 | { |
196 | 196 | if (acpi_processor_update_tsd_coord()) |
197 | 197 | pr_debug("Assume no T-state coordination\n"); |
198 | | - |
199 | | - return; |
200 | 198 | } |
201 | 199 |
|
202 | 200 | static int acpi_processor_throttling_notifier(unsigned long event, void *data) |
203 | 201 | { |
204 | 202 | struct throttling_tstate *p_tstate = data; |
205 | 203 | struct acpi_processor *pr; |
206 | | - unsigned int cpu ; |
| 204 | + unsigned int cpu; |
207 | 205 | int target_state; |
208 | 206 | struct acpi_processor_limit *p_limit; |
209 | 207 | struct acpi_processor_throttling *p_throttling; |
@@ -477,7 +475,7 @@ static int acpi_processor_get_throttling_control(struct acpi_processor *pr) |
477 | 475 | goto end; |
478 | 476 | } |
479 | 477 |
|
480 | | - end: |
| 478 | +end: |
481 | 479 | kfree(buffer.pointer); |
482 | 480 |
|
483 | 481 | return result; |
@@ -554,7 +552,7 @@ static int acpi_processor_get_throttling_states(struct acpi_processor *pr) |
554 | 552 | } |
555 | 553 | } |
556 | 554 |
|
557 | | - end: |
| 555 | +end: |
558 | 556 | kfree(buffer.pointer); |
559 | 557 |
|
560 | 558 | return result; |
@@ -639,7 +637,7 @@ static int acpi_processor_get_tsd(struct acpi_processor *pr) |
639 | 637 | pthrottling->shared_type = DOMAIN_COORD_TYPE_SW_ALL; |
640 | 638 | } |
641 | 639 |
|
642 | | - end: |
| 640 | +end: |
643 | 641 | kfree(buffer.pointer); |
644 | 642 | return result; |
645 | 643 | } |
@@ -717,7 +715,7 @@ static int acpi_throttling_rdmsr(u64 *value) |
717 | 715 | msr_low = 0; |
718 | 716 | msr_high = 0; |
719 | 717 | rdmsr_safe(MSR_IA32_THERM_CONTROL, |
720 | | - (u32 *)&msr_low , (u32 *) &msr_high); |
| 718 | + (u32 *)&msr_low, (u32 *) &msr_high); |
721 | 719 | msr = (msr_high << 32) | msr_low; |
722 | 720 | *value = (u64) msr; |
723 | 721 | ret = 0; |
@@ -1185,8 +1183,7 @@ int acpi_processor_get_throttling_info(struct acpi_processor *pr) |
1185 | 1183 | */ |
1186 | 1184 | if (acpi_processor_get_throttling_control(pr) || |
1187 | 1185 | acpi_processor_get_throttling_states(pr) || |
1188 | | - acpi_processor_get_platform_limit(pr)) |
1189 | | - { |
| 1186 | + acpi_processor_get_platform_limit(pr)) { |
1190 | 1187 | pr->throttling.acpi_processor_get_throttling = |
1191 | 1188 | &acpi_processor_get_throttling_fadt; |
1192 | 1189 | pr->throttling.acpi_processor_set_throttling = |
@@ -1246,7 +1243,7 @@ int acpi_processor_get_throttling_info(struct acpi_processor *pr) |
1246 | 1243 | goto end; |
1247 | 1244 | } |
1248 | 1245 |
|
1249 | | - end: |
| 1246 | +end: |
1250 | 1247 | if (result) |
1251 | 1248 | pr->flags.throttling = 0; |
1252 | 1249 |
|
|
0 commit comments