From: Andrew Morton Signed-off-by: Andrew Morton --- arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c | 3 +-- arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff -puN arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c~git-cpufreq-fixup arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c --- devel/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c~git-cpufreq-fixup 2006-06-05 23:01:23.000000000 -0700 +++ devel-akpm/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c 2006-06-05 23:01:23.000000000 -0700 @@ -106,7 +106,7 @@ acpi_processor_set_performance ( u16 port = 0; u8 bit_width = 0; int i = 0; - int ret = 0; + int ret; u32 value = 0; int retval; struct acpi_processor_performance *perf; @@ -174,7 +174,6 @@ acpi_processor_set_performance ( udelay(10); } } else { - i = 0; value = (u32) perf->states[state].status; } diff -puN arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c~git-cpufreq-fixup arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c --- devel/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c~git-cpufreq-fixup 2006-06-05 23:02:01.000000000 -0700 +++ devel-akpm/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c 2006-06-05 23:02:37.000000000 -0700 @@ -400,7 +400,7 @@ static int centrino_cpu_init_acpi(struct /* register with ACPI core */ if (acpi_processor_register_performance(p, cpu)) { - dprintk(KERN_INFO PFX "obtaining ACPI data failed\n"); + dprintk("obtaining ACPI data failed\n"); return -EIO; } policy->cpus = p->shared_cpu_map; @@ -499,7 +499,7 @@ static int centrino_cpu_init_acpi(struct kfree(centrino_model[cpu]); err_unreg: acpi_processor_unregister_performance(p, cpu); - dprintk(KERN_INFO PFX "invalid ACPI data\n"); + dprintk("invalid ACPI data\n"); return (result); } #else @@ -557,7 +557,7 @@ static int centrino_cpu_init(struct cpuf /* check to see if it stuck */ rdmsr(MSR_IA32_MISC_ENABLE, l, h); if (!(l & (1<<16))) { - printk(KERN_INFO PFX "couldn't enable Enhanced SpeedStep\n"); + printk("couldn't enable Enhanced SpeedStep\n"); return -ENODEV; } } _