2006-08-20 02:20:08

by Dave Jones

[permalink] [raw]
Subject: [CPUFREQ] acpi-cpufreq: Ignore failure from acpi_cpufreq_early_init_acpi

Ignore the return value of early_init_acpi(), as it can give false error
messages. If there is something really wrong, then register_driver will fail
cleanly with EINVAL later.

[ background: modprobe acpi-cpufreq on systems not capable of speed-scaling
started failing with 'invalid argument', where previously it would only
ever -ENODEV

I'm not 100% happy with the solution. It'd be better to handle
failure properly, but this is a low-impact change for 2.6.18
We can always revisit doing this better in .19 --davej.]

Signed-off-by: Venkatesh Pallipadi <[email protected]>
Signed-off-by: Dave Jones <[email protected]>

Index: linux-2.6.18-rc4/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
===================================================================
--- linux-2.6.18-rc4.orig/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
+++ linux-2.6.18-rc4/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
@@ -567,16 +567,11 @@ static struct cpufreq_driver acpi_cpufre
static int __init
acpi_cpufreq_init (void)
{
- int result = 0;
-
dprintk("acpi_cpufreq_init\n");

- result = acpi_cpufreq_early_init_acpi();
+ acpi_cpufreq_early_init_acpi();

- if (!result)
- result = cpufreq_register_driver(&acpi_cpufreq_driver);
-
- return (result);
+ return cpufreq_register_driver(&acpi_cpufreq_driver);
}

--
http://www.codemonkey.org.uk