From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 8 Feb 2016 22:57:22 +0000 (+0100)
Subject: cpufreq: governor: Drop pointless goto from cpufreq_governor_init()
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=fafd5e8ab29d965d6c7db326f2d4189dd9f3b002;p=deliverable%2Flinux.git

cpufreq: governor: Drop pointless goto from cpufreq_governor_init()

It is silly to jump around "return 0", so don't do that.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
---

diff --git a/drivers/cpufreq/cpufreq_governor.c b/drivers/cpufreq/cpufreq_governor.c
index 298be52adea0..d6bd402a3237 100644
--- a/drivers/cpufreq/cpufreq_governor.c
+++ b/drivers/cpufreq/cpufreq_governor.c
@@ -395,12 +395,11 @@ static int cpufreq_governor_init(struct cpufreq_policy *policy)
 
 	ret = sysfs_create_group(get_governor_parent_kobj(policy),
 				 get_sysfs_attr(gov));
-	if (ret)
-		goto reset_gdbs_data;
+	if (!ret)
+		return 0;
 
-	return 0;
+	/* Failure, so roll back. */
 
-reset_gdbs_data:
 	policy->governor_data = NULL;
 
 	if (!have_governor_per_policy())