]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
cpufreq: s3c64xx: Fix compilation warning
authorViresh Kumar <viresh.kumar@linaro.org>
Wed, 22 Jan 2025 06:06:16 +0000 (11:36 +0530)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 23 Jan 2025 19:47:32 +0000 (20:47 +0100)
The driver generates following warning when regulator support isn't
enabled in the kernel. Fix it.

   drivers/cpufreq/s3c64xx-cpufreq.c: In function 's3c64xx_cpufreq_set_target':
>> drivers/cpufreq/s3c64xx-cpufreq.c:55:22: warning: variable 'old_freq' set but not used [-Wunused-but-set-variable]
      55 |         unsigned int old_freq, new_freq;
         |                      ^~~~~~~~
>> drivers/cpufreq/s3c64xx-cpufreq.c:54:30: warning: variable 'dvfs' set but not used [-Wunused-but-set-variable]
      54 |         struct s3c64xx_dvfs *dvfs;
         |                              ^~~~

Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202501191803.CtfT7b2o-lkp@intel.com/
Cc: 5.4+ <stable@vger.kernel.org> # v5.4+
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Link: https://patch.msgid.link/236b227e929e5adc04d1e9e7af6845a46c8e9432.1737525916.git.viresh.kumar@linaro.org
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/cpufreq/s3c64xx-cpufreq.c

index c6bdfc308e99085bd5d8939d106c3454ac0eba90..9cef7152807626849cab6febff406d89383a7e4d 100644 (file)
@@ -24,6 +24,7 @@ struct s3c64xx_dvfs {
        unsigned int vddarm_max;
 };
 
+#ifdef CONFIG_REGULATOR
 static struct s3c64xx_dvfs s3c64xx_dvfs_table[] = {
        [0] = { 1000000, 1150000 },
        [1] = { 1050000, 1150000 },
@@ -31,6 +32,7 @@ static struct s3c64xx_dvfs s3c64xx_dvfs_table[] = {
        [3] = { 1200000, 1350000 },
        [4] = { 1300000, 1350000 },
 };
+#endif
 
 static struct cpufreq_frequency_table s3c64xx_freq_table[] = {
        { 0, 0,  66000 },
@@ -51,15 +53,16 @@ static struct cpufreq_frequency_table s3c64xx_freq_table[] = {
 static int s3c64xx_cpufreq_set_target(struct cpufreq_policy *policy,
                                      unsigned int index)
 {
-       struct s3c64xx_dvfs *dvfs;
-       unsigned int old_freq, new_freq;
+       unsigned int new_freq = s3c64xx_freq_table[index].frequency;
        int ret;
 
+#ifdef CONFIG_REGULATOR
+       struct s3c64xx_dvfs *dvfs;
+       unsigned int old_freq;
+
        old_freq = clk_get_rate(policy->clk) / 1000;
-       new_freq = s3c64xx_freq_table[index].frequency;
        dvfs = &s3c64xx_dvfs_table[s3c64xx_freq_table[index].driver_data];
 
-#ifdef CONFIG_REGULATOR
        if (vddarm && new_freq > old_freq) {
                ret = regulator_set_voltage(vddarm,
                                            dvfs->vddarm_min,