git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
acpi
/
processor_perflib.c
diff --git
a/drivers/acpi/processor_perflib.c
b/drivers/acpi/processor_perflib.c
index
7ba5e49
..
cbb6f08
100644
(file)
--- a/
drivers/acpi/processor_perflib.c
+++ b/
drivers/acpi/processor_perflib.c
@@
-83,10
+83,8
@@
static int acpi_processor_ppc_notifier(struct notifier_block *nb,
goto out;
ppc = (unsigned int)pr->performance_platform_limit;
goto out;
ppc = (unsigned int)pr->performance_platform_limit;
- if (!ppc)
- goto out;
- if (ppc > pr->performance->state_count)
+ if (ppc >
=
pr->performance->state_count)
goto out;
cpufreq_verify_within_limits(policy, 0,
goto out;
cpufreq_verify_within_limits(policy, 0,
@@
-238,7
+236,7
@@
static int acpi_processor_get_performance_states(struct acpi_processor *pr)
return -ENODEV;
}
return -ENODEV;
}
- pss =
(union acpi_object *)
buffer.pointer;
+ pss = buffer.pointer;
if (!pss || (pss->type != ACPI_TYPE_PACKAGE)) {
printk(KERN_ERR PREFIX "Invalid _PSS data\n");
result = -EFAULT;
if (!pss || (pss->type != ACPI_TYPE_PACKAGE)) {
printk(KERN_ERR PREFIX "Invalid _PSS data\n");
result = -EFAULT;
@@
-324,10
+322,6
@@
static int acpi_processor_get_performance_info(struct acpi_processor *pr)
if (result)
return result;
if (result)
return result;
- result = acpi_processor_get_platform_limit(pr);
- if (result)
- return result;
-
return 0;
}
return 0;
}
@@
-412,7
+406,7
@@
static struct file_operations acpi_processor_perf_fops = {
static int acpi_processor_perf_seq_show(struct seq_file *seq, void *offset)
{
static int acpi_processor_perf_seq_show(struct seq_file *seq, void *offset)
{
- struct acpi_processor *pr =
(struct acpi_processor *)
seq->private;
+ struct acpi_processor *pr = seq->private;
int i;
int i;
@@
-453,8
+447,8
@@
acpi_processor_write_performance(struct file *file,
size_t count, loff_t * data)
{
int result = 0;
size_t count, loff_t * data)
{
int result = 0;
- struct seq_file *m =
(struct seq_file *)
file->private_data;
- struct acpi_processor *pr =
(struct acpi_processor *)
m->private;
+ struct seq_file *m = file->private_data;
+ struct acpi_processor *pr = m->private;
struct acpi_processor_performance *perf;
char state_string[12] = { '\0' };
unsigned int new_state = 0;
struct acpi_processor_performance *perf;
char state_string[12] = { '\0' };
unsigned int new_state = 0;
@@
-553,7
+547,7
@@
static int acpi_processor_get_psd(struct acpi_processor *pr)
return -ENODEV;
}
return -ENODEV;
}
- psd =
(union acpi_object *)
buffer.pointer;
+ psd = buffer.pointer;
if (!psd || (psd->type != ACPI_TYPE_PACKAGE)) {
ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid _PSD data\n"));
result = -EFAULT;
if (!psd || (psd->type != ACPI_TYPE_PACKAGE)) {
ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid _PSD data\n"));
result = -EFAULT;
@@
-738,10
+732,6
@@
int acpi_processor_preregister_performance(
}
err_ret:
}
err_ret:
- if (retval) {
- ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Error while parsing _PSD domain information. Assuming no coordination\n"));
- }
-
for_each_possible_cpu(i) {
pr = processors[i];
if (!pr || !pr->performance)
for_each_possible_cpu(i) {
pr = processors[i];
if (!pr || !pr->performance)