GIT 911cb74bb9e77e40749abc2fca6fe74d87d940f3 git+ssh://master.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git commit 911cb74bb9e77e40749abc2fca6fe74d87d940f3 Author: Dave Jones Date: Thu Jun 1 11:38:28 2006 -0400 [CPUFREQ] Make acpi-cpufreq 'sticky'. This prevents annoying messages being printed when it gets loaded on a machine that doesn't have support scaling via ACPI. Signed-off-by: Dave Jones commit 75de7d55f8e148848cadefc92140d8f083d13924 Author: Dave Jones Date: Wed May 31 16:13:14 2006 -0400 [CPUFREQ] Remove strange No-op from longrun.c ORing something with zero is meaningless. ACKed-by: Dominik Brodowski Signed-off-by: Dave Jones commit 484944a5b002cf87b38a8f073d37afcfb8afff28 Author: Dave Jones Date: Tue May 30 18:09:31 2006 -0400 [CPUFREQ] Remove more freq_table reinitialisations. Signed-off-by: Dave Jones commit 5557976ca97c3a3002805f575a45ad354e1050ff Author: Dave Jones Date: Tue May 30 17:59:48 2006 -0400 [CPUFREQ] Fix another redundant initialisation in freq_table Signed-off-by: Dave Jones commit 355eb318018c6f44a335b0e5efb1f3bf2f1685d0 Author: Dave Jones Date: Tue May 30 17:58:41 2006 -0400 [CPUFREQ] Remove duplicate assignment in freq_table Signed-off-by: Dave Jones commit 511e9ee17099c6ebe315c0524b8b482d4767ab3d Author: Dave Jones Date: Tue May 30 17:57:14 2006 -0400 [CPUFREQ] CodingStyle nits in cpufreq_stats.c Signed-off-by: Dave Jones commit 851777b7b686c80e417fd811cdea3e5aa5305745 Author: Dave Jones Date: Tue May 30 17:55:01 2006 -0400 [CPUFREQ] Remove duplicate assignment from cpufreq-nforce2 Signed-off-by: Dave Jones commit b6571da9f328999a6bce429b5f614a3d64b926ee Author: Dave Jones Date: Tue May 30 17:50:22 2006 -0400 [CPUFREQ] Remove pointless reinitialisations in acpi-cpufreq Signed-off-by: Dave Jones commit 83844510ec9dc89a676e71d3cc28289905c2caec Author: Dave Jones Date: Tue May 30 17:43:54 2006 -0400 [CPUFREQ] Remove pointless reinitialisation from powernow-k8 This var is already set at entry to the function. Signed-off-by: Dave Jones commit 8eebf1a4c3682f71dbda3348abfcdd4d2a751fd3 Author: Dave Jones Date: Tue May 30 17:40:16 2006 -0400 [CPUFREQ] Remove redundant initialisation from longhaul. Signed-off-by: Dave Jones commit e2aa8732ac11570acddf326874a34ab684752e34 Author: Dave Jones Date: Tue May 30 17:37:15 2006 -0400 [CPUFREQ] Clean up longhaul's speed pretty-printer Getting ready to move to core cpufreq. - Use snprintf - Remove unnecessary nesting improving readability. Signed-off-by: Dave Jones commit 8cbe0169053ffa185ad349088eb0901946c14a09 Author: Dave Jones Date: Tue May 30 17:26:08 2006 -0400 [CPUFREQ] Disambiguate loop indexes in powernow-k7 This shouldn't have actually caused any problems (as we return if we 'corrupt' 'i', but it's still not very pretty. For the sake of adding another local variable, this got cleaner. Signed-off-by: Dave Jones commit 2e3f8faaa73f5065ae653a84997b5cd4d5876e1a Author: Dave Jones Date: Tue May 30 17:25:14 2006 -0400 [CPUFREQ] Typo in powernow-k8 (Also fix some horked indentation) Signed-off-by: Dave Jones --- Signed-off-by: Andrew Morton --- arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c | 17 ++++++------ arch/i386/kernel/cpu/cpufreq/cpufreq-nforce2.c | 3 -- arch/i386/kernel/cpu/cpufreq/longhaul.c | 20 +++++++++------ arch/i386/kernel/cpu/cpufreq/longrun.c | 1 arch/i386/kernel/cpu/cpufreq/powernow-k7.c | 8 +++--- arch/i386/kernel/cpu/cpufreq/powernow-k8.c | 8 ++---- drivers/cpufreq/cpufreq_stats.c | 6 ++-- drivers/cpufreq/freq_table.c | 16 +++++++----- 8 files changed, 42 insertions(+), 37 deletions(-) diff -puN arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c~git-cpufreq arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c --- devel/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c~git-cpufreq 2006-06-03 18:42:21.000000000 -0700 +++ devel-akpm/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c 2006-06-03 18:42:22.000000000 -0700 @@ -549,14 +549,15 @@ static struct freq_attr* acpi_cpufreq_at }; static struct cpufreq_driver acpi_cpufreq_driver = { - .verify = acpi_cpufreq_verify, - .target = acpi_cpufreq_target, - .init = acpi_cpufreq_cpu_init, - .exit = acpi_cpufreq_cpu_exit, - .resume = acpi_cpufreq_resume, - .name = "acpi-cpufreq", - .owner = THIS_MODULE, - .attr = acpi_cpufreq_attr, + .verify = acpi_cpufreq_verify, + .target = acpi_cpufreq_target, + .init = acpi_cpufreq_cpu_init, + .exit = acpi_cpufreq_cpu_exit, + .resume = acpi_cpufreq_resume, + .name = "acpi-cpufreq", + .owner = THIS_MODULE, + .attr = acpi_cpufreq_attr, + .flags = CPUFREQ_STICKY, }; diff -puN arch/i386/kernel/cpu/cpufreq/cpufreq-nforce2.c~git-cpufreq arch/i386/kernel/cpu/cpufreq/cpufreq-nforce2.c --- devel/arch/i386/kernel/cpu/cpufreq/cpufreq-nforce2.c~git-cpufreq 2006-06-03 18:42:21.000000000 -0700 +++ devel-akpm/arch/i386/kernel/cpu/cpufreq/cpufreq-nforce2.c 2006-06-03 18:42:22.000000000 -0700 @@ -117,8 +117,7 @@ static void nforce2_write_pll(int pll) int temp; /* Set the pll addr. to 0x00 */ - temp = 0x00; - pci_write_config_dword(nforce2_chipset_dev, NFORCE2_PLLADR, temp); + pci_write_config_dword(nforce2_chipset_dev, NFORCE2_PLLADR, 0); /* Now write the value in all 64 registers */ for (temp = 0; temp <= 0x3f; temp++) diff -puN arch/i386/kernel/cpu/cpufreq/longhaul.c~git-cpufreq arch/i386/kernel/cpu/cpufreq/longhaul.c --- devel/arch/i386/kernel/cpu/cpufreq/longhaul.c~git-cpufreq 2006-06-03 18:42:21.000000000 -0700 +++ devel-akpm/arch/i386/kernel/cpu/cpufreq/longhaul.c 2006-06-03 18:42:22.000000000 -0700 @@ -77,13 +77,17 @@ static char speedbuffer[8]; static char *print_speed(int speed) { - if (speed > 1000) { - if (speed%1000 == 0) - sprintf (speedbuffer, "%dGHz", speed/1000); - else - sprintf (speedbuffer, "%d.%dGHz", speed/1000, (speed%1000)/100); - } else - sprintf (speedbuffer, "%dMHz", speed); + if (speed < 1000) { + snprintf(speedbuffer, sizeof(speedbuffer),"%dMHz", speed); + return speedbuffer; + } + + if (speed%1000 == 0) + snprintf(speedbuffer, sizeof(speedbuffer), + "%dGHz", speed/1000); + else + snprintf(speedbuffer, sizeof(speedbuffer), + "%d.%dGHz", speed/1000, (speed%1000)/100); return speedbuffer; } @@ -675,7 +679,7 @@ static int __init longhaul_init(void) static void __exit longhaul_exit(void) { - int i=0; + int i; for (i=0; i < numscales; i++) { if (clock_ratio[i] == maxmult) { diff -puN arch/i386/kernel/cpu/cpufreq/longrun.c~git-cpufreq arch/i386/kernel/cpu/cpufreq/longrun.c --- devel/arch/i386/kernel/cpu/cpufreq/longrun.c~git-cpufreq 2006-06-03 18:42:22.000000000 -0700 +++ devel-akpm/arch/i386/kernel/cpu/cpufreq/longrun.c 2006-06-03 18:42:22.000000000 -0700 @@ -223,7 +223,6 @@ static unsigned int __init longrun_deter /* set to 0 to try_hi perf_pctg */ msr_lo &= 0xFFFFFF80; msr_hi &= 0xFFFFFF80; - msr_lo |= 0; msr_hi |= try_hi; wrmsr(MSR_TMTA_LONGRUN_CTRL, msr_lo, msr_hi); diff -puN arch/i386/kernel/cpu/cpufreq/powernow-k7.c~git-cpufreq arch/i386/kernel/cpu/cpufreq/powernow-k7.c --- devel/arch/i386/kernel/cpu/cpufreq/powernow-k7.c~git-cpufreq 2006-06-03 18:42:22.000000000 -0700 +++ devel-akpm/arch/i386/kernel/cpu/cpufreq/powernow-k7.c 2006-06-03 18:42:22.000000000 -0700 @@ -452,23 +452,23 @@ static int powernow_decode_bios (int max pst = (struct pst_s *) p; - for (i = 0 ; i numpst; i++) { + for (j=0; jnumpst; j++) { pst = (struct pst_s *) p; number_scales = pst->numpstates; if ((etuple == pst->cpuid) && check_fsb(pst->fsbspeed) && (maxfid==pst->maxfid) && (startvid==pst->startvid)) { - dprintk ("PST:%d (@%p)\n", i, pst); + dprintk ("PST:%d (@%p)\n", j, pst); dprintk (" cpuid: 0x%x fsb: %d maxFID: 0x%x startvid: 0x%x\n", pst->cpuid, pst->fsbspeed, pst->maxfid, pst->startvid); ret = get_ranges ((char *) pst + sizeof (struct pst_s)); return ret; - } else { + unsigned int k; p = (char *) pst + sizeof (struct pst_s); - for (j=0 ; j < number_scales; j++) + for (k=0; kcpu]) { freqs.cpu = i; cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE); - } + } return res; } @@ -933,10 +933,8 @@ static int powernowk8_target(struct cpuf dprintk("targ: cpu %d, %d kHz, min %d, max %d, relation %d\n", pol->cpu, targfreq, pol->min, pol->max, relation); - if (query_current_values_with_pending_wait(data)) { - ret = -EIO; + if (query_current_values_with_pending_wait(data)) goto err_out; - } dprintk("targ: curr fid 0x%x, vid 0x%x\n", data->currfid, data->currvid); diff -puN drivers/cpufreq/cpufreq_stats.c~git-cpufreq drivers/cpufreq/cpufreq_stats.c --- devel/drivers/cpufreq/cpufreq_stats.c~git-cpufreq 2006-06-03 18:42:22.000000000 -0700 +++ devel-akpm/drivers/cpufreq/cpufreq_stats.c 2006-06-03 18:42:22.000000000 -0700 @@ -74,7 +74,7 @@ static ssize_t show_total_trans(struct cpufreq_policy *policy, char *buf) { struct cpufreq_stats *stat = cpufreq_stats_table[policy->cpu]; - if(!stat) + if (!stat) return 0; return sprintf(buf, "%d\n", cpufreq_stats_table[stat->cpu]->total_trans); @@ -86,7 +86,7 @@ show_time_in_state(struct cpufreq_policy ssize_t len = 0; int i; struct cpufreq_stats *stat = cpufreq_stats_table[policy->cpu]; - if(!stat) + if (!stat) return 0; cpufreq_stats_update(stat->cpu); for (i = 0; i < stat->state_num; i++) { @@ -104,7 +104,7 @@ show_trans_table(struct cpufreq_policy * int i, j; struct cpufreq_stats *stat = cpufreq_stats_table[policy->cpu]; - if(!stat) + if (!stat) return 0; cpufreq_stats_update(stat->cpu); len += snprintf(buf + len, PAGE_SIZE - len, " From : To\n"); diff -puN drivers/cpufreq/freq_table.c~git-cpufreq drivers/cpufreq/freq_table.c --- devel/drivers/cpufreq/freq_table.c~git-cpufreq 2006-06-03 18:42:22.000000000 -0700 +++ devel-akpm/drivers/cpufreq/freq_table.c 2006-06-03 18:42:22.000000000 -0700 @@ -20,7 +20,7 @@ int cpufreq_frequency_table_cpuinfo(stru { unsigned int min_freq = ~0; unsigned int max_freq = 0; - unsigned int i = 0; + unsigned int i; for (i=0; (table[i].frequency != CPUFREQ_TABLE_END); i++) { unsigned int freq = table[i].frequency; @@ -51,7 +51,7 @@ int cpufreq_frequency_table_verify(struc struct cpufreq_frequency_table *table) { unsigned int next_larger = ~0; - unsigned int i = 0; + unsigned int i; unsigned int count = 0; dprintk("request for verification of policy (%u - %u kHz) for cpu %u\n", policy->min, policy->max, policy->cpu); @@ -91,20 +91,24 @@ int cpufreq_frequency_table_target(struc unsigned int relation, unsigned int *index) { - struct cpufreq_frequency_table optimal = { .index = ~0, }; - struct cpufreq_frequency_table suboptimal = { .index = ~0, }; + struct cpufreq_frequency_table optimal = { + .index = ~0, + .frequency = 0, + }; + struct cpufreq_frequency_table suboptimal = { + .index = ~0, + .frequency = 0, + }; unsigned int i; dprintk("request for target %u kHz (relation: %u) for cpu %u\n", target_freq, relation, policy->cpu); switch (relation) { case CPUFREQ_RELATION_H: - optimal.frequency = 0; suboptimal.frequency = ~0; break; case CPUFREQ_RELATION_L: optimal.frequency = ~0; - suboptimal.frequency = 0; break; } _