Skip to contentSkip to conversation

drivers/cpufreq/acpi-cpufreq.c: This fixes the following checkpatch warning

PATCH Superseded Mohan Kumar 2 participants 4 messages Apr 14, 2019 – Apr 15, 2019 CPU frequency scaling framework

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drivers/cpufreq/acpi-cpufreq.c: This fixes the following checkpatch warning

WARNING: Prefer using '"%s...", __func__' to using function's name, in a string

Switch hardcoded function name with a reference to __func__ making the code more maintainable

---
 drivers/cpufreq/acpi-cpufreq.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)
drivers/cpufreq/acpi-cpufreq.c +10 -10
index c72258a..8030dcd 100644
@@ -366,7 +366,7 @@ static u32 get_cur_val(const struct cpumask *mask, struct acpi_cpufreq_data *dat
 
 	val = drv_read(data, mask);
 
-	pr_debug("get_cur_val = %u\n", val);
+	pr_debug("%s = %u\n", __func__, val);
 
 	return val;
 }
@@ -378,7 +378,7 @@ static unsigned int get_cur_freq_on_cpu(unsigned int cpu)
 	unsigned int freq;
 	unsigned int cached_freq;
 
-	pr_debug("get_cur_freq_on_cpu (%d)\n", cpu);
+	pr_debug("%s (%d)\n", __func__, cpu);
 
 	policy = cpufreq_cpu_get_raw(cpu);
 	if (unlikely(!policy))
@@ -458,8 +458,8 @@ static int acpi_cpufreq_target(struct cpufreq_policy *policy,
 	if (acpi_pstate_strict) {
 		if (!check_freqs(policy, mask,
 				 policy->freq_table[index].frequency)) {
-			pr_debug("acpi_cpufreq_target failed (%d)\n",
-				policy->cpu);
+			pr_debug("%s (%d)\n",
+				__func__, policy->cpu);
 			result = -EAGAIN;
 		}
 	}
@@ -573,7 +573,7 @@ static int cpufreq_boost_down_prep(unsigned int cpu)
 static int __init acpi_cpufreq_early_init(void)
 {
 	unsigned int i;
-	pr_debug("acpi_cpufreq_early_init\n");
+	pr_debug("%s\n", __func__);
 
 	acpi_perf_data = alloc_percpu(struct acpi_processor_performance);
 	if (!acpi_perf_data) {
@@ -657,7 +657,7 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
 	static int blacklisted;
 #endif
 
-	pr_debug("acpi_cpufreq_cpu_init\n");
+	pr_debug("%s\n", __func__);
 
 #ifdef CONFIG_SMP
 	if (blacklisted)
@@ -856,7 +856,7 @@ static int acpi_cpufreq_cpu_exit(struct cpufreq_policy *policy)
 {
 	struct acpi_cpufreq_data *data = policy->driver_data;
 
-	pr_debug("acpi_cpufreq_cpu_exit\n");
+	pr_debug("%s\n", __func__);
 
 	policy->fast_switch_possible = false;
 	policy->driver_data = NULL;
@@ -881,7 +881,7 @@ static int acpi_cpufreq_resume(struct cpufreq_policy *policy)
 {
 	struct acpi_cpufreq_data *data = policy->driver_data;
 
-	pr_debug("acpi_cpufreq_resume\n");
+	pr_debug("%s\n", __func__);
 
 	data->resume = 1;
 
@@ -954,7 +954,7 @@ static int __init acpi_cpufreq_init(void)
 	if (cpufreq_get_current_driver())
 		return -EEXIST;
 
-	pr_debug("acpi_cpufreq_init\n");
+	pr_debug("%s\n", __func__);
 
 	ret = acpi_cpufreq_early_init();
 	if (ret)
@@ -991,7 +991,7 @@ static int __init acpi_cpufreq_init(void)
 
 static void __exit acpi_cpufreq_exit(void)
 {
-	pr_debug("acpi_cpufreq_exit\n");
+	pr_debug("%s\n", __func__);
 
 	acpi_cpufreq_boost_exit();
 
Signature · 1 line
2.7.4
maintainer
#1 lore raw
Quoted 34 lines · Mohan Kumar

WARNING: Prefer using '"%s...", __func__' to using function's name, in a string

Switch hardcoded function name with a reference to __func__ making the code more maintainable

---
 drivers/cpufreq/acpi-cpufreq.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)
drivers/cpufreq/acpi-cpufreq.c +2 -2
index c72258a..8030dcd 100644
@@ -366,7 +366,7 @@ static u32 get_cur_val(const struct cpumask *mask, struct acpi_cpufreq_data *dat
 
 	val = drv_read(data, mask);
 
-	pr_debug("get_cur_val = %u\n", val);
+	pr_debug("%s = %u\n", __func__, val);
 
 	return val;
 }
@@ -378,7 +378,7 @@ static unsigned int get_cur_freq_on_cpu(unsigned int cpu)
 	unsigned int freq;
 	unsigned int cached_freq;
 
-	pr_debug("get_cur_freq_on_cpu (%d)\n", cpu);
+	pr_debug("%s (%d)\n", __func__, cpu);
 
 	policy = cpufreq_cpu_get_raw(cpu);
 	if (unlikely(!policy))

drivers/cpufreq/acpi-cpufreq.c static int acpi_cpufreq_target(struct cpufreq_policy *policy, · line 462

Quoted 7 lines
drivers/cpufreq/acpi-cpufreq.c +2 -2
@@ -458,8 +458,8 @@ static int acpi_cpufreq_target(struct cpufreq_policy *policy,
 	if (acpi_pstate_strict) {
 		if (!check_freqs(policy, mask,
 				 policy->freq_table[index].frequency)) {
-			pr_debug("acpi_cpufreq_target failed (%d)\n",
-				policy->cpu);
+			pr_debug("%s (%d)\n",
+				__func__, policy->cpu);

Why break line here ?

Signature · 1 line
viresh
#2 lore raw

PATCH 1/1 drivers/cpufreq/acpi-cpufreq.c: This fixes the remove the unnecessary line break.

In reply to Mohan Kumar

Remove the unnecessary line break.

---
 drivers/cpufreq/acpi-cpufreq.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/cpufreq/acpi-cpufreq.c +1 -2
index 8030dcd..73bb2aa 100644
@@ -458,8 +458,7 @@ static int acpi_cpufreq_target(struct cpufreq_policy *policy,
 	if (acpi_pstate_strict) {
 		if (!check_freqs(policy, mask,
 				 policy->freq_table[index].frequency)) {
-			pr_debug("%s (%d)\n",
-				__func__, policy->cpu);
+			pr_debug("%s (%d)\n", __func__, policy->cpu);
 			result = -EAGAIN;
 		}
 	}
Signature · 1 line
2.7.4
maintainer
#3 lore raw

Re: [PATCH] drivers/cpufreq/acpi-cpufreq.c: This fixes the remove the unnecessary line break.

Quoted 12 lines · Mohan Kumar

Remove the unnecessary line break.

---
 drivers/cpufreq/acpi-cpufreq.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/cpufreq/acpi-cpufreq.c +0 -0
index 8030dcd..73bb2aa 100644

drivers/cpufreq/acpi-cpufreq.c static int acpi_cpufreq_target(struct cpufreq_policy *policy, · line 464

Quoted 9 lines
drivers/cpufreq/acpi-cpufreq.c +1 -2
@@ -458,8 +458,7 @@ static int acpi_cpufreq_target(struct cpufreq_policy *policy,
 	if (acpi_pstate_strict) {
 		if (!check_freqs(policy, mask,
 				 policy->freq_table[index].frequency)) {
-			pr_debug("%s (%d)\n",
-				__func__, policy->cpu);
+			pr_debug("%s (%d)\n", __func__, policy->cpu);
 			result = -EAGAIN;
 		}
 	}

Please fix the earlier patch with this and resend.

Signature · 1 line
viresh