From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760458Ab2BJXbq (ORCPT ); Fri, 10 Feb 2012 18:31:46 -0500 Received: from ogre.sisk.pl ([217.79.144.158]:47347 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753048Ab2BJXbo (ORCPT ); Fri, 10 Feb 2012 18:31:44 -0500 From: "Rafael J. Wysocki" To: Linux PM list Subject: [PATCH] PM / Sleep: Remove unnecessary label from suspend_freeze_processes() Date: Sat, 11 Feb 2012 00:35:32 +0100 User-Agent: KMail/1.13.6 (Linux/3.3.0-rc2+; KDE/4.6.0; x86_64; ; ) Cc: LKML , "Srivatsa S. Bhat" MIME-Version: 1.0 Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <201202110035.32993.rjw@sisk.pl> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Rafael J. Wysocki The Finish label in suspend_freeze_processes() is in fact necessary and makes the function look more complicated that it really is, so remove it (along with a few empty lines). Signed-off-by: Rafael J. Wysocki --- The patch is on top of linux-pm/pm-sleep. Thanks, Rafael --- kernel/power/power.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) Index: linux/kernel/power/power.h =================================================================== --- linux.orig/kernel/power/power.h +++ linux/kernel/power/power.h @@ -234,16 +234,14 @@ static inline int suspend_freeze_process int error; error = freeze_processes(); - /* * freeze_processes() automatically thaws every task if freezing * fails. So we need not do anything extra upon error. */ if (error) - goto Finish; + return error; error = freeze_kernel_threads(); - /* * freeze_kernel_threads() thaws only kernel threads upon freezing * failure. So we have to thaw the userspace tasks ourselves. @@ -251,7 +249,6 @@ static inline int suspend_freeze_process if (error) thaw_processes(); - Finish: return error; }