From patchwork Thu Sep 4 03:39:42 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 4842741 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 5D4619FC4D for ; Thu, 4 Sep 2014 03:37:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 46BEC20251 for ; Thu, 4 Sep 2014 03:37:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3FC822024F for ; Thu, 4 Sep 2014 03:37:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932468AbaIDDh0 (ORCPT ); Wed, 3 Sep 2014 23:37:26 -0400 Received: from mail-pd0-f181.google.com ([209.85.192.181]:50695 "EHLO mail-pd0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932163AbaIDDhY (ORCPT ); Wed, 3 Sep 2014 23:37:24 -0400 Received: by mail-pd0-f181.google.com with SMTP id fp1so12730556pdb.12 for ; Wed, 03 Sep 2014 20:37:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:date:message-id:subject; bh=Jj86GCggGmx2B7gONEWeanb/+4y1zkQvpL0a87YOvRk=; b=IrJeagQiujNIP7w5NrJBQmw32llBB+V7XSg8zKim03flWJjoyQz5WJ+uF1VaHfgXNK b3ErC+eEKs06eKj7ZYV9zGzn6dAM2kbhZ1Zt8y1yIHt+DGdw1FVGrjXzG+WduxziZqqQ O2F8uqJhg5HRaM6SpK2BfYJ6vQVqzfTgk3pOyfWSJ3GMzWYjD5nwZ6dSQ3SZgY1yBbfP 6Jq9DJKf1JAC9m5FVbR4LPjOOJylyk5OkCf4J30LucCVnC+inIaBoPPPr4DOlTCNhdQV RlbvrXKmJK5mUsjd94ZwgOc9V0vGtovDJFdmVKzX3SwxfOswCSTHySFpt+oosfc6rrrN 4h0g== X-Received: by 10.70.98.176 with SMTP id ej16mr3159307pdb.165.1409801842375; Wed, 03 Sep 2014 20:37:22 -0700 (PDT) Received: from [127.0.0.1] (s214090.ppp.asahi-net.or.jp. [220.157.214.90]) by mx.google.com with ESMTPSA id nl2sm287742pdb.83.2014.09.03.20.37.19 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Sep 2014 20:37:21 -0700 (PDT) From: Magnus Damm To: linux-sh@vger.kernel.org Cc: Magnus Damm , horms@verge.net.au, geert+renesas@glider.be Date: Thu, 04 Sep 2014 12:39:42 +0900 Message-Id: <20140904033942.22881.84361.sendpatchset@w520> Subject: [PATCH] ARM: shmobile: r8a7740: Cleanup PM Kconfig usage Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-8.5 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Magnus Damm Simplify the r8a7740 PM code by using CONFIG_PM_RMOBILE instead of having a complex #if expression embedded in the C code. Signed-off-by: Magnus Damm --- Built on top of renesas-devel-20140904-v3.17-rc3 arch/arm/mach-shmobile/pm-r8a7740.c | 6 ++++-- arch/arm/mach-shmobile/r8a7740.h | 7 +------ 2 files changed, 5 insertions(+), 8 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- 0001/arch/arm/mach-shmobile/pm-r8a7740.c +++ work/arch/arm/mach-shmobile/pm-r8a7740.c 2014-09-04 12:29:12.000000000 +0900 @@ -13,7 +13,7 @@ #include "common.h" #include "pm-rmobile.h" -#if defined(CONFIG_PM) && !defined(CONFIG_ARCH_MULTIPLATFORM) +#ifdef CONFIG_PM_RMOBILE static int r8a7740_pd_a4s_suspend(void) { /* @@ -58,7 +58,9 @@ void __init r8a7740_init_pm_domains(void rmobile_init_domains(r8a7740_pm_domains, ARRAY_SIZE(r8a7740_pm_domains)); pm_genpd_add_subdomain_names("A4S", "A3SP"); } -#endif /* CONFIG_PM && !CONFIG_ARCH_MULTIPLATFORM */ +#else +void r8a7740_init_pm_domains(void) {} +#endif #ifdef CONFIG_SUSPEND static int r8a7740_enter_suspend(suspend_state_t suspend_state) --- 0001/arch/arm/mach-shmobile/r8a7740.h +++ work/arch/arm/mach-shmobile/r8a7740.h 2014-09-04 12:29:12.000000000 +0900 @@ -52,11 +52,6 @@ extern void r8a7740_add_standard_devices extern void r8a7740_clock_init(u8 md_ck); extern void r8a7740_pinmux_init(void); extern void r8a7740_pm_init(void); - -#if defined(CONFIG_PM) && !defined(CONFIG_ARCH_MULTIPLATFORM) -extern void __init r8a7740_init_pm_domains(void); -#else -static inline void r8a7740_init_pm_domains(void) {} -#endif /* CONFIG_PM && !CONFIG_ARCH_MULTIPLATFORM */ +extern void r8a7740_init_pm_domains(void); #endif /* __ASM_R8A7740_H__ */