From patchwork Wed Mar 26 11:21:19 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 27107 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f197.google.com (mail-ie0-f197.google.com [209.85.223.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 5BD64206F9 for ; Wed, 26 Mar 2014 11:23:30 +0000 (UTC) Received: by mail-ie0-f197.google.com with SMTP id rd18sf6606529iec.4 for ; Wed, 26 Mar 2014 04:23:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:in-reply-to:references :sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=HYpKLm92j+R6XSc3fRVRmKNQW7jdDcwtJ6cJGpQxSII=; b=iMK5vHWodO6BWoTTSWLgYvZ11d2T2ms2hGdutzlnebsRLBkIHjNKAp5GRHp2bW3fkW szbE28uTNKs1x4J6oePXiu8FpLMSQJoSGtOfjWixTA0UXMtDyiK7PuMVNur6hqMqLm4m tCFSi+1nRaALg0WeHW0f8Dt31XBmw2Mmk1mA+NmCdF3ure6OyEGVvmnlwho4v8hmdIqN cxqYYAjxkNGWmAbKFWeH9xHf6sSiVkZUoOYoWLsJPgtUSGGF6LFIvnu0ZzS1mw6edpWY xpKHOZmvrUfapOL9RBS84ohzzHyzxVq+l7Jh9uiyv+qoJy5uQMWjB7ww4RReHpmIIqbm x+xA== X-Gm-Message-State: ALoCoQm8ADesRnrPvu5PscIN/e0N6cELOPXMMLDxSuABVPFyrZSR8viyWTx/S/9MDKLs4dloARtd X-Received: by 10.182.11.70 with SMTP id o6mr17291291obb.19.1395833009722; Wed, 26 Mar 2014 04:23:29 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.30.202 with SMTP id d68ls604612qgd.44.gmail; Wed, 26 Mar 2014 04:23:29 -0700 (PDT) X-Received: by 10.220.249.6 with SMTP id mi6mr102410vcb.33.1395833009601; Wed, 26 Mar 2014 04:23:29 -0700 (PDT) Received: from mail-ve0-f169.google.com (mail-ve0-f169.google.com [209.85.128.169]) by mx.google.com with ESMTPS id a8si4435626vej.179.2014.03.26.04.23.29 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 26 Mar 2014 04:23:29 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.169 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.169; Received: by mail-ve0-f169.google.com with SMTP id pa12so2128232veb.14 for ; Wed, 26 Mar 2014 04:23:29 -0700 (PDT) X-Received: by 10.58.190.99 with SMTP id gp3mr95557vec.32.1395833009519; Wed, 26 Mar 2014 04:23:29 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.78.9 with SMTP id i9csp38098vck; Wed, 26 Mar 2014 04:23:29 -0700 (PDT) X-Received: by 10.68.194.97 with SMTP id hv1mr17200253pbc.162.1395833008606; Wed, 26 Mar 2014 04:23:28 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id zw7si9858230pac.193.2014.03.26.04.23.27; Wed, 26 Mar 2014 04:23:28 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754841AbaCZLXI (ORCPT + 26 others); Wed, 26 Mar 2014 07:23:08 -0400 Received: from mail-wg0-f47.google.com ([74.125.82.47]:44340 "EHLO mail-wg0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753771AbaCZLXG (ORCPT ); Wed, 26 Mar 2014 07:23:06 -0400 Received: by mail-wg0-f47.google.com with SMTP id x12so1172350wgg.18 for ; Wed, 26 Mar 2014 04:23:05 -0700 (PDT) X-Received: by 10.180.8.170 with SMTP id s10mr30337946wia.35.1395832985063; Wed, 26 Mar 2014 04:23:05 -0700 (PDT) Received: from localhost ([213.122.173.131]) by mx.google.com with ESMTPSA id dd5sm1781376wib.12.2014.03.26.04.23.01 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 26 Mar 2014 04:23:04 -0700 (PDT) From: Viresh Kumar To: tglx@linutronix.de Cc: linaro-kernel@lists.linaro.org, linux-kernel@vger.kernel.org, fweisbec@gmail.com, linaro-networking@linaro.org, Viresh Kumar Subject: [PATCH 13/14] timer: simplify CPU_UP_PREPARE notifier code path Date: Wed, 26 Mar 2014 16:51:19 +0530 Message-Id: <5d9ab05cbefb2dabe660c5ac57432fc097e06291.1395832156.git.viresh.kumar@linaro.org> X-Mailer: git-send-email 1.7.12.rc2.18.g61b472e In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: viresh.kumar@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.169 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Currently we are returning notifier_from_errno() from CPU_UP_PREPARE notifier when we detect an error while calling init_timers_cpu(). notifier_from_errno() already has enough checks within to do something similar. And so we can call it directly without checking if there was an error or not. Signed-off-by: Viresh Kumar Reviewed-by: Srivatsa S. Bhat --- kernel/timer.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/kernel/timer.c b/kernel/timer.c index 1d35dda..4360edc 100644 --- a/kernel/timer.c +++ b/kernel/timer.c @@ -1646,9 +1646,7 @@ static int timer_cpu_notify(struct notifier_block *self, case CPU_UP_PREPARE: case CPU_UP_PREPARE_FROZEN: err = init_timers_cpu(cpu); - if (err < 0) - return notifier_from_errno(err); - break; + return notifier_from_errno(err); #ifdef CONFIG_HOTPLUG_CPU case CPU_DEAD: case CPU_DEAD_FROZEN: