Skip to contentSkip to conversation

cpufreq: Remove unnecessary braces

PATCH In review Stratos Karafotis 3 participants 4 messages Mar 19, 2014 – Mar 20, 2014 CPU frequency scaling framework

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 cpufreq: Remove unnecessary braces

Remove 3 sets of unnecessary braces

---
 drivers/cpufreq/cpufreq.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)
drivers/cpufreq/cpufreq.c +4 -7
index 1eafd8c..ca3c01f 100644
@@ -1325,17 +1325,16 @@ static int __cpufreq_remove_dev_prepare(struct device *dev,
 	cpus = cpumask_weight(policy->cpus);
 	up_read(&policy->rwsem);
 
-	if (cpu != policy->cpu) {
+	if (cpu != policy->cpu)
 		sysfs_remove_link(&dev->kobj, "cpufreq");
-	} else if (cpus > 1) {
+	else if (cpus > 1) {
 		new_cpu = cpufreq_nominate_new_policy_cpu(policy, cpu);
 		if (new_cpu >= 0) {
 			update_policy_cpu(policy, new_cpu);
 
-			if (!cpufreq_suspended) {
+			if (!cpufreq_suspended)
 				pr_debug("%s: policy Kobject moved to cpu: %d from: %d\n",
 					 __func__, new_cpu, cpu);
-			}
 		}
 	}
 
@@ -2158,11 +2157,9 @@ int cpufreq_update_policy(unsigned int cpu)
 		if (!policy->cur) {
 			pr_debug("Driver did not initialize current freq\n");
 			policy->cur = new_policy.cur;
-		} else {
-			if (policy->cur != new_policy.cur && has_target())
+		} else if (policy->cur != new_policy.cur && has_target())
 				cpufreq_out_of_sync(cpu, policy->cur,
 								new_policy.cur);
-		}
 	}
 
 	ret = cpufreq_set_policy(policy, &new_policy);
Signature · 1 line
1.8.5.3
#1 lore raw
Quoted 12 lines · Stratos Karafotis

Remove 3 sets of unnecessary braces

---
 drivers/cpufreq/cpufreq.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)
drivers/cpufreq/cpufreq.c +0 -0
index 1eafd8c..ca3c01f 100644

drivers/cpufreq/cpufreq.c static int __cpufreq_remove_dev_prepare(struct device *dev, · line 1330

Quoted 7 lines
drivers/cpufreq/cpufreq.c +1 -2
@@ -1325,17 +1325,16 @@ static int __cpufreq_remove_dev_prepare(struct device *dev,
 	cpus = cpumask_weight(policy->cpus);
 	up_read(&policy->rwsem);
 
-	if (cpu != policy->cpu) {
+	if (cpu != policy->cpu)
 		sysfs_remove_link(&dev->kobj, "cpufreq");
-	} else if (cpus > 1) {

These braces aren't in fact unnecessary, they are in accordance with CodingStyle.

Quoted 14 lines
drivers/cpufreq/cpufreq.c +2 -2
+	else if (cpus > 1) {
 		new_cpu = cpufreq_nominate_new_policy_cpu(policy, cpu);
 		if (new_cpu >= 0) {
 			update_policy_cpu(policy, new_cpu);
 
-			if (!cpufreq_suspended) {
+			if (!cpufreq_suspended)
 				pr_debug("%s: policy Kobject moved to cpu: %d from: %d\n",
 					 __func__, new_cpu, cpu);
-			}
 		}
 	}
 

drivers/cpufreq/cpufreq.c int cpufreq_update_policy(unsigned int cpu) · line 2160

Quoted 6 lines
drivers/cpufreq/cpufreq.c +1 -2
@@ -2158,11 +2157,9 @@ int cpufreq_update_policy(unsigned int cpu)
 		if (!policy->cur) {
 			pr_debug("Driver did not initialize current freq\n");
 			policy->cur = new_policy.cur;
-		} else {
-			if (policy->cur != new_policy.cur && has_target())
+		} else if (policy->cur != new_policy.cur && has_target())

And here too.

Quoted 7 lines
drivers/cpufreq/cpufreq.c +0 -1
 				cpufreq_out_of_sync(cpu, policy->cur,
 								new_policy.cur);
-		}
 	}
 
 	ret = cpufreq_set_policy(policy, &new_policy);
Signature · 2 lines
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.
#2 lore raw
Quoted 46 lines · Rafael J. Wysocki
Quoted 12 lines · Stratos Karafotis

Remove 3 sets of unnecessary braces

---
 drivers/cpufreq/cpufreq.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)
drivers/cpufreq/cpufreq.c +0 -0
index 1eafd8c..ca3c01f 100644

drivers/cpufreq/cpufreq.c static int __cpufreq_remove_dev_prepare(struct device *dev, · line 1330

Quoted 7 lines
drivers/cpufreq/cpufreq.c +1 -2
@@ -1325,17 +1325,16 @@ static int __cpufreq_remove_dev_prepare(struct device *dev,
 	cpus = cpumask_weight(policy->cpus);
 	up_read(&policy->rwsem);
 
-	if (cpu != policy->cpu) {
+	if (cpu != policy->cpu)
 		sysfs_remove_link(&dev->kobj, "cpufreq");
-	} else if (cpus > 1) {

These braces aren't in fact unnecessary, they are in accordance with CodingStyle.

Quoted 14 lines
drivers/cpufreq/cpufreq.c +2 -2
+	else if (cpus > 1) {
 		new_cpu = cpufreq_nominate_new_policy_cpu(policy, cpu);
 		if (new_cpu >= 0) {
 			update_policy_cpu(policy, new_cpu);
 
-			if (!cpufreq_suspended) {
+			if (!cpufreq_suspended)
 				pr_debug("%s: policy Kobject moved to cpu: %d from: %d\n",
 					 __func__, new_cpu, cpu);
-			}
 		}
 	}
 

drivers/cpufreq/cpufreq.c int cpufreq_update_policy(unsigned int cpu) · line 2160

Quoted 6 lines
drivers/cpufreq/cpufreq.c +1 -2
@@ -2158,11 +2157,9 @@ int cpufreq_update_policy(unsigned int cpu)
 		if (!policy->cur) {
 			pr_debug("Driver did not initialize current freq\n");
 			policy->cur = new_policy.cur;
-		} else {
-			if (policy->cur != new_policy.cur && has_target())
+		} else if (policy->cur != new_policy.cur && has_target())

And here too.

Quoted 8 lines

drivers/cpufreq/cpufreq.c int cpufreq_update_policy(unsigned int cpu) · line 2165

Quoted 7 lines
drivers/cpufreq/cpufreq.c +0 -1
 				cpufreq_out_of_sync(cpu, policy->cur,
 								new_policy.cur);
-		}
 	}
 
 	ret = cpufreq_set_policy(policy, &new_policy);

I'm sorry for the inconvenience. I read again the CodingStyle (more carefully :) ). I'm sending the corrected patch with the single case of unnecessary braces.

Thanks,
Stratos

------------------------8<----------------------- Remove unnecessary braces from a single statement.

---
 drivers/cpufreq/cpufreq.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/cpufreq/cpufreq.c +1 -2
index e3aa9de..220c4a9 100644
@@ -1330,10 +1330,9 @@ static int __cpufreq_remove_dev_prepare(struct device *dev,
 		if (new_cpu >= 0) {
 			update_policy_cpu(policy, new_cpu);
 
-			if (!cpufreq_suspended) {
+			if (!cpufreq_suspended)
 				pr_debug("%s: policy Kobject moved to cpu: %d from: %d\n",
 					 __func__, new_cpu, cpu);
-			}
 		}
 	}
 
Signature · 1 line
1.8.5.3
maintainer Acked-by
#3 lore raw
Quoted 19 lines · Stratos Karafotis

I'm sorry for the inconvenience. I read again the CodingStyle (more carefully :) ). I'm sending the corrected patch with the single case of unnecessary braces.

Thanks,
Stratos

------------------------8<----------------------- Remove unnecessary braces from a single statement.

---
 drivers/cpufreq/cpufreq.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/cpufreq/cpufreq.c +0 -0
index e3aa9de..220c4a9 100644

drivers/cpufreq/cpufreq.c static int __cpufreq_remove_dev_prepare(struct device *dev, · line 1337

Quoted 10 lines
drivers/cpufreq/cpufreq.c +1 -2
@@ -1330,10 +1330,9 @@ static int __cpufreq_remove_dev_prepare(struct device *dev,
                if (new_cpu >= 0) {
                        update_policy_cpu(policy, new_cpu);
 
-                       if (!cpufreq_suspended) {
+                       if (!cpufreq_suspended)
                                pr_debug("%s: policy Kobject moved to cpu: %d from: %d\n",
                                         __func__, new_cpu, cpu);
-                       }
                }
        }