Skip to content

Commit

Permalink
ACPI: processor: perflib: Adjust white space
Browse files Browse the repository at this point in the history 
Some inconsistent usage of white space in the ACPI processor performance
library code causes that code to be somewhat harder to read that it
would have been otherwise, so adjust the white space in there to
address that.

No expected functional impact.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
  • Loading branch information
Rafael J. Wysocki committed Dec 7, 2022
1 parent b697b81 commit 3d9e9a9
Showing 1 changed file with 15 additions and 20 deletions.
35 changes: 15 additions & 20 deletions drivers/acpi/processor_perflib.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ int acpi_processor_get_bios_limit(int cpu, unsigned int *limit)
pr = per_cpu(processors, cpu);
if (!pr || !pr->performance || !pr->performance->state_count)
return -ENODEV;

*limit = pr->performance->states[pr->performance_platform_limit].
core_frequency * 1000;
return 0;
Expand Down Expand Up @@ -201,8 +202,7 @@ static int acpi_processor_get_performance_control(struct acpi_processor *pr)
}

pct = (union acpi_object *)buffer.pointer;
if (!pct || (pct->type != ACPI_TYPE_PACKAGE)
|| (pct->package.count != 2)) {
if (!pct || (pct->type != ACPI_TYPE_PACKAGE) || (pct->package.count != 2)) {
pr_err("Invalid _PCT data\n");
result = -EFAULT;
goto end;
Expand All @@ -214,9 +214,9 @@ static int acpi_processor_get_performance_control(struct acpi_processor *pr)

obj = pct->package.elements[0];

if ((obj.type != ACPI_TYPE_BUFFER)
|| (obj.buffer.length < sizeof(struct acpi_pct_register))
|| (obj.buffer.pointer == NULL)) {
if ((obj.type != ACPI_TYPE_BUFFER) ||
(obj.buffer.length < sizeof(struct acpi_pct_register)) ||
(obj.buffer.pointer == NULL)) {
pr_err("Invalid _PCT data (control_register)\n");
result = -EFAULT;
goto end;
Expand All @@ -230,9 +230,9 @@ static int acpi_processor_get_performance_control(struct acpi_processor *pr)

obj = pct->package.elements[1];

if ((obj.type != ACPI_TYPE_BUFFER)
|| (obj.buffer.length < sizeof(struct acpi_pct_register))
|| (obj.buffer.pointer == NULL)) {
if ((obj.type != ACPI_TYPE_BUFFER) ||
(obj.buffer.length < sizeof(struct acpi_pct_register)) ||
(obj.buffer.pointer == NULL)) {
pr_err("Invalid _PCT data (status_register)\n");
result = -EFAULT;
goto end;
Expand Down Expand Up @@ -260,8 +260,8 @@ static void amd_fixup_frequency(struct acpi_processor_px *px, int i)
if (boot_cpu_data.x86_vendor != X86_VENDOR_AMD)
return;

if ((boot_cpu_data.x86 == 0x10 && boot_cpu_data.x86_model < 10)
|| boot_cpu_data.x86 == 0x11) {
if ((boot_cpu_data.x86 == 0x10 && boot_cpu_data.x86_model < 10) ||
boot_cpu_data.x86 == 0x11) {
rdmsr(MSR_AMD_PSTATE_DEF_BASE + index, lo, hi);
/*
* MSR C001_0064+:
Expand Down Expand Up @@ -353,8 +353,7 @@ static int acpi_processor_get_performance_states(struct acpi_processor *pr)
* Check that ACPI's u64 MHz will be valid as u32 KHz in cpufreq
*/
if (!px->core_frequency ||
((u32)(px->core_frequency * 1000) !=
(px->core_frequency * 1000))) {
((u32)(px->core_frequency * 1000) != (px->core_frequency * 1000))) {
pr_err(FW_BUG
"Invalid BIOS _PSS frequency found for processor %d: 0x%llx MHz\n",
pr->id, px->core_frequency);
Expand Down Expand Up @@ -499,7 +498,6 @@ int acpi_processor_notify_smm(struct module *calling_module)

return 0;
}

EXPORT_SYMBOL(acpi_processor_notify_smm);

int acpi_processor_get_psd(acpi_handle handle, struct acpi_psd_package *pdomain)
Expand Down Expand Up @@ -532,8 +530,7 @@ int acpi_processor_get_psd(acpi_handle handle, struct acpi_psd_package *pdomain)
state.length = sizeof(struct acpi_psd_package);
state.pointer = pdomain;

status = acpi_extract_package(&(psd->package.elements[0]),
&format, &state);
status = acpi_extract_package(&(psd->package.elements[0]), &format, &state);
if (ACPI_FAILURE(status)) {
pr_err("Invalid _PSD data\n");
result = -EFAULT;
Expand Down Expand Up @@ -716,9 +713,8 @@ int acpi_processor_preregister_performance(
}
EXPORT_SYMBOL(acpi_processor_preregister_performance);

int
acpi_processor_register_performance(struct acpi_processor_performance
*performance, unsigned int cpu)
int acpi_processor_register_performance(struct acpi_processor_performance
*performance, unsigned int cpu)
{
struct acpi_processor *pr;

Expand Down Expand Up @@ -751,7 +747,6 @@ acpi_processor_register_performance(struct acpi_processor_performance
mutex_unlock(&performance_mutex);
return 0;
}

EXPORT_SYMBOL(acpi_processor_register_performance);

void acpi_processor_unregister_performance(unsigned int cpu)
Expand All @@ -768,11 +763,11 @@ void acpi_processor_unregister_performance(unsigned int cpu)

if (pr->performance)
kfree(pr->performance->states);

pr->performance = NULL;

mutex_unlock(&performance_mutex);

return;
}

EXPORT_SYMBOL(acpi_processor_unregister_performance);

0 comments on commit 3d9e9a9

Please sign in to comment.