From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757176AbcBHW4P (ORCPT ); Mon, 8 Feb 2016 17:56:15 -0500 Received: from v094114.home.net.pl ([79.96.170.134]:59286 "HELO v094114.home.net.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1756708AbcBHW4L (ORCPT ); Mon, 8 Feb 2016 17:56:11 -0500 From: "Rafael J. Wysocki" To: Linux PM list Cc: Linux Kernel Mailing List , Viresh Kumar Subject: [PATCH] cpufreq: governor: Drop pointless goto from cpufreq_governor_init() Date: Mon, 08 Feb 2016 23:57:22 +0100 Message-ID: <121264863.5TXTuENuar@vostro.rjw.lan> User-Agent: KMail/4.11.5 (Linux/4.5.0-rc1+; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="utf-8" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Rafael J. Wysocki It is silly to jump around "return 0", so don't do that. Signed-off-by: Rafael J. Wysocki --- On top of the bleeding-edge branch of linux-pm.git. Thanks, Rafael --- drivers/cpufreq/cpufreq_governor.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) Index: linux-pm/drivers/cpufreq/cpufreq_governor.c =================================================================== --- linux-pm.orig/drivers/cpufreq/cpufreq_governor.c +++ linux-pm/drivers/cpufreq/cpufreq_governor.c @@ -394,12 +394,11 @@ static int cpufreq_governor_init(struct 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())