From patchwork Sun Feb 10 05:58:10 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Len Brown X-Patchwork-Id: 2121371 X-Patchwork-Delegate: lenb@kernel.org Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id D13533FDFB for ; Sun, 10 Feb 2013 05:58:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752264Ab3BJF6j (ORCPT ); Sun, 10 Feb 2013 00:58:39 -0500 Received: from mail-vc0-f175.google.com ([209.85.220.175]:57863 "EHLO mail-vc0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751712Ab3BJF6f (ORCPT ); Sun, 10 Feb 2013 00:58:35 -0500 Received: by mail-vc0-f175.google.com with SMTP id fw7so3165000vcb.20 for ; Sat, 09 Feb 2013 21:58:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:in-reply-to:references:reply-to:organization; bh=9qWF6pqQ+laIV5UdBucPyOxQLnuaGPanZ+0TRjve+IE=; b=wdZa7/gRVJD1rKDBbjxjC3cWtvkDtS1MLMlLgKcNeOBEySa3hX4CgadNJ+OP62lKJY A4cFOF7Z+8AbCOj6eBS5ev4k7dfAB6slqnazBvBMZ+98JgBtLh7tANuGIPEd/WAXiV8M Nh3h2/NoYeqLNzvnYdQb4NaAmj8XlXWF9wDyRJndzxRKdhY592oSHHS56oswwblvP2jc HsEbM6roF5OOj8gCJ9pNGN2kl3FtCjfmoITYBXlKnajhpIHqM4lWouBKt1OVNyqsGmZz xb25ORdwP/lwVHnL4XpIuM8hMNvxf6G5rCzItLpZSt/3/YZ4ZN28ungallHeuqsk+p7u pQbA== X-Received: by 10.58.117.229 with SMTP id kh5mr13804677veb.27.1360475914097; Sat, 09 Feb 2013 21:58:34 -0800 (PST) Received: from x980.localdomain6 (pool-108-7-58-246.bstnma.fios.verizon.net. [108.7.58.246]) by mx.google.com with ESMTPS id p7sm42173052vdt.2.2013.02.09.21.58.32 (version=TLSv1 cipher=RC4-SHA bits=128/128); Sat, 09 Feb 2013 21:58:33 -0800 (PST) From: Len Brown To: linux-pm@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Len Brown , linux-sh@vger.kernel.org Subject: [PATCH 03/16] sh idle: rename global pm_idle to static sh_idle Date: Sun, 10 Feb 2013 00:58:10 -0500 Message-Id: <298823d45d644cb8aab67e59f0be0ebeeaf42039.1360475150.git.len.brown@intel.com> X-Mailer: git-send-email 1.8.1.3.535.ga923c31 In-Reply-To: <1360475903-30007-1-git-send-email-lenb@kernel.org> References: <1360475903-30007-1-git-send-email-lenb@kernel.org> In-Reply-To: <2b219d07e0f287c2c713f5465fc8646158fa986e.1360475150.git.len.brown@intel.com> References: <2b219d07e0f287c2c713f5465fc8646158fa986e.1360475150.git.len.brown@intel.com> Reply-To: Len Brown Organization: Intel Open Source Technology Center Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org From: Len Brown SH idle code could use some simplification. This patch enables that by guaranteeing that "sh_idle" is local, and thus architecture specific. Signed-off-by: Len Brown Cc: linux-sh@vger.kernel.org --- arch/sh/kernel/idle.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/sh/kernel/idle.c b/arch/sh/kernel/idle.c index 0c91016..3d5a1b3 100644 --- a/arch/sh/kernel/idle.c +++ b/arch/sh/kernel/idle.c @@ -22,7 +22,7 @@ #include #include -void (*pm_idle)(void); +static void (*sh_idle)(void); static int hlt_counter; @@ -103,9 +103,9 @@ void cpu_idle(void) /* Don't trace irqs off for idle */ stop_critical_timings(); if (cpuidle_idle_call()) - pm_idle(); + sh_idle(); /* - * Sanity check to ensure that pm_idle() returns + * Sanity check to ensure that sh_idle() returns * with IRQs enabled */ WARN_ON(irqs_disabled()); @@ -123,13 +123,13 @@ void __init select_idle_routine(void) /* * If a platform has set its own idle routine, leave it alone. */ - if (pm_idle) + if (sh_idle) return; if (hlt_works()) - pm_idle = default_idle; + sh_idle = default_idle; else - pm_idle = poll_idle; + sh_idle = poll_idle; } void stop_this_cpu(void *unused)