diff options
-rw-r--r-- | drivers/mfd/db8500-prcmu.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/drivers/mfd/db8500-prcmu.c b/drivers/mfd/db8500-prcmu.c index 7694e0700d34..b11fdd63eecd 100644 --- a/drivers/mfd/db8500-prcmu.c +++ b/drivers/mfd/db8500-prcmu.c | |||
@@ -1734,18 +1734,17 @@ static struct cpufreq_frequency_table db8500_cpufreq_table[] = { | |||
1734 | 1734 | ||
1735 | static long round_armss_rate(unsigned long rate) | 1735 | static long round_armss_rate(unsigned long rate) |
1736 | { | 1736 | { |
1737 | struct cpufreq_frequency_table *pos; | ||
1737 | long freq = 0; | 1738 | long freq = 0; |
1738 | int i = 0; | ||
1739 | 1739 | ||
1740 | /* cpufreq table frequencies is in KHz. */ | 1740 | /* cpufreq table frequencies is in KHz. */ |
1741 | rate = rate / 1000; | 1741 | rate = rate / 1000; |
1742 | 1742 | ||
1743 | /* Find the corresponding arm opp from the cpufreq table. */ | 1743 | /* Find the corresponding arm opp from the cpufreq table. */ |
1744 | while (db8500_cpufreq_table[i].frequency != CPUFREQ_TABLE_END) { | 1744 | cpufreq_for_each_entry(pos, db8500_cpufreq_table) { |
1745 | freq = db8500_cpufreq_table[i].frequency; | 1745 | freq = pos->frequency; |
1746 | if (freq == rate) | 1746 | if (freq == rate) |
1747 | break; | 1747 | break; |
1748 | i++; | ||
1749 | } | 1748 | } |
1750 | 1749 | ||
1751 | /* Return the last valid value, even if a match was not found. */ | 1750 | /* Return the last valid value, even if a match was not found. */ |
@@ -1886,23 +1885,21 @@ static void set_clock_rate(u8 clock, unsigned long rate) | |||
1886 | 1885 | ||
1887 | static int set_armss_rate(unsigned long rate) | 1886 | static int set_armss_rate(unsigned long rate) |
1888 | { | 1887 | { |
1889 | int i = 0; | 1888 | struct cpufreq_frequency_table *pos; |
1890 | 1889 | ||
1891 | /* cpufreq table frequencies is in KHz. */ | 1890 | /* cpufreq table frequencies is in KHz. */ |
1892 | rate = rate / 1000; | 1891 | rate = rate / 1000; |
1893 | 1892 | ||
1894 | /* Find the corresponding arm opp from the cpufreq table. */ | 1893 | /* Find the corresponding arm opp from the cpufreq table. */ |
1895 | while (db8500_cpufreq_table[i].frequency != CPUFREQ_TABLE_END) { | 1894 | cpufreq_for_each_entry(pos, db8500_cpufreq_table) |
1896 | if (db8500_cpufreq_table[i].frequency == rate) | 1895 | if (pos->frequency == rate) |
1897 | break; | 1896 | break; |
1898 | i++; | ||
1899 | } | ||
1900 | 1897 | ||
1901 | if (db8500_cpufreq_table[i].frequency != rate) | 1898 | if (pos->frequency != rate) |
1902 | return -EINVAL; | 1899 | return -EINVAL; |
1903 | 1900 | ||
1904 | /* Set the new arm opp. */ | 1901 | /* Set the new arm opp. */ |
1905 | return db8500_prcmu_set_arm_opp(db8500_cpufreq_table[i].driver_data); | 1902 | return db8500_prcmu_set_arm_opp(pos->driver_data); |
1906 | } | 1903 | } |
1907 | 1904 | ||
1908 | static int set_plldsi_rate(unsigned long rate) | 1905 | static int set_plldsi_rate(unsigned long rate) |