Skip to content

Commit c05fa40

Browse files
committed
cpufreq: core: Rearrange variable declarations involving __free()
Follow cleanup.h recommendations and always define and assign variables in one statement when __free() is used. No intentional functional impact. Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Acked-by: Viresh Kumar <viresh.kumar@linaro.org> Link: https://patch.msgid.link/4691667.LvFx2qVVIh@rafael.j.wysocki
1 parent e5e9b7b commit c05fa40

1 file changed

Lines changed: 7 additions & 20 deletions

File tree

drivers/cpufreq/cpufreq.c

Lines changed: 7 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1845,7 +1845,6 @@ static unsigned int cpufreq_verify_current_freq(struct cpufreq_policy *policy, b
18451845
*/
18461846
unsigned int cpufreq_quick_get(unsigned int cpu)
18471847
{
1848-
struct cpufreq_policy *policy __free(put_cpufreq_policy) = NULL;
18491848
unsigned long flags;
18501849

18511850
read_lock_irqsave(&cpufreq_driver_lock, flags);
@@ -1860,7 +1859,7 @@ unsigned int cpufreq_quick_get(unsigned int cpu)
18601859

18611860
read_unlock_irqrestore(&cpufreq_driver_lock, flags);
18621861

1863-
policy = cpufreq_cpu_get(cpu);
1862+
struct cpufreq_policy *policy __free(put_cpufreq_policy) = cpufreq_cpu_get(cpu);
18641863
if (policy)
18651864
return policy->cur;
18661865

@@ -1876,9 +1875,7 @@ EXPORT_SYMBOL(cpufreq_quick_get);
18761875
*/
18771876
unsigned int cpufreq_quick_get_max(unsigned int cpu)
18781877
{
1879-
struct cpufreq_policy *policy __free(put_cpufreq_policy);
1880-
1881-
policy = cpufreq_cpu_get(cpu);
1878+
struct cpufreq_policy *policy __free(put_cpufreq_policy) = cpufreq_cpu_get(cpu);
18821879
if (policy)
18831880
return policy->max;
18841881

@@ -1894,9 +1891,7 @@ EXPORT_SYMBOL(cpufreq_quick_get_max);
18941891
*/
18951892
__weak unsigned int cpufreq_get_hw_max_freq(unsigned int cpu)
18961893
{
1897-
struct cpufreq_policy *policy __free(put_cpufreq_policy);
1898-
1899-
policy = cpufreq_cpu_get(cpu);
1894+
struct cpufreq_policy *policy __free(put_cpufreq_policy) = cpufreq_cpu_get(cpu);
19001895
if (policy)
19011896
return policy->cpuinfo.max_freq;
19021897

@@ -1920,9 +1915,7 @@ static unsigned int __cpufreq_get(struct cpufreq_policy *policy)
19201915
*/
19211916
unsigned int cpufreq_get(unsigned int cpu)
19221917
{
1923-
struct cpufreq_policy *policy __free(put_cpufreq_policy);
1924-
1925-
policy = cpufreq_cpu_get(cpu);
1918+
struct cpufreq_policy *policy __free(put_cpufreq_policy) = cpufreq_cpu_get(cpu);
19261919
if (!policy)
19271920
return 0;
19281921

@@ -2751,9 +2744,7 @@ static void cpufreq_policy_refresh(struct cpufreq_policy *policy)
27512744
*/
27522745
void cpufreq_update_policy(unsigned int cpu)
27532746
{
2754-
struct cpufreq_policy *policy __free(put_cpufreq_policy);
2755-
2756-
policy = cpufreq_cpu_get(cpu);
2747+
struct cpufreq_policy *policy __free(put_cpufreq_policy) = cpufreq_cpu_get(cpu);
27572748
if (!policy)
27582749
return;
27592750

@@ -2770,9 +2761,7 @@ EXPORT_SYMBOL(cpufreq_update_policy);
27702761
*/
27712762
void cpufreq_update_limits(unsigned int cpu)
27722763
{
2773-
struct cpufreq_policy *policy __free(put_cpufreq_policy);
2774-
2775-
policy = cpufreq_cpu_get(cpu);
2764+
struct cpufreq_policy *policy __free(put_cpufreq_policy) = cpufreq_cpu_get(cpu);
27762765
if (!policy)
27772766
return;
27782767

@@ -3054,9 +3043,7 @@ static int __init cpufreq_core_init(void)
30543043

30553044
static bool cpufreq_policy_is_good_for_eas(unsigned int cpu)
30563045
{
3057-
struct cpufreq_policy *policy __free(put_cpufreq_policy);
3058-
3059-
policy = cpufreq_cpu_get(cpu);
3046+
struct cpufreq_policy *policy __free(put_cpufreq_policy) = cpufreq_cpu_get(cpu);
30603047
if (!policy) {
30613048
pr_debug("cpufreq policy not set for CPU: %d\n", cpu);
30623049
return false;

0 commit comments

Comments
 (0)