Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755429AbdC1LTw (ORCPT ); Tue, 28 Mar 2017 07:19:52 -0400 Received: from mail.free-electrons.com ([62.4.15.54]:59086 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754703AbdC1LTt (ORCPT ); Tue, 28 Mar 2017 07:19:49 -0400 From: Alexandre Belloni To: Nicolas Ferre Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Boris Brezillon , Wenyou.Yang@microchip.com, Alexandre Belloni Subject: [PATCH v2 02/11] ARM: at91: pm: Move at91_ramc_read/write to pm.c Date: Tue, 28 Mar 2017 13:19:29 +0200 Message-Id: <20170328111938.21297-3-alexandre.belloni@free-electrons.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170328111938.21297-1-alexandre.belloni@free-electrons.com> References: <20170328111938.21297-1-alexandre.belloni@free-electrons.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1364 Lines: 47 Those macros are only used in pm.c, move them there so we can remove the test on __ASSEMBLY__. Signed-off-by: Alexandre Belloni --- arch/arm/mach-at91/pm.c | 6 ++++++ arch/arm/mach-at91/pm.h | 8 -------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c index 9e2b5c1e503e..41789aa4df86 100644 --- a/arch/arm/mach-at91/pm.c +++ b/arch/arm/mach-at91/pm.c @@ -45,6 +45,12 @@ static struct { } at91_pm_data; static void __iomem *at91_ramc_base[2]; +#define at91_ramc_read(id, field) \ + __raw_readl(at91_ramc_base[id] + field) + +#define at91_ramc_write(id, field, value) \ + __raw_writel(value, at91_ramc_base[id] + field) + static int at91_pm_valid_state(suspend_state_t state) { diff --git a/arch/arm/mach-at91/pm.h b/arch/arm/mach-at91/pm.h index bf980c6ef294..8eed156ef19a 100644 --- a/arch/arm/mach-at91/pm.h +++ b/arch/arm/mach-at91/pm.h @@ -17,14 +17,6 @@ #include #include -#ifndef __ASSEMBLY__ -#define at91_ramc_read(id, field) \ - __raw_readl(at91_ramc_base[id] + field) - -#define at91_ramc_write(id, field, value) \ - __raw_writel(value, at91_ramc_base[id] + field) -#endif - #define AT91_MEMCTRL_MC 0 #define AT91_MEMCTRL_SDRAMC 1 #define AT91_MEMCTRL_DDRSDR 2 -- 2.11.0