From c440545679922096dc8c84705e22c6a7d0b2e513 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E9=BB=84=E6=B6=9B?= Date: Tue, 1 Jul 2014 15:57:34 +0800 Subject: [PATCH] ARM: rockchip: pm: fix compilation warning --- arch/arm/mach-rockchip/pm.h | 6 +++--- arch/arm/mach-rockchip/rockchip_pm.c | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm/mach-rockchip/pm.h b/arch/arm/mach-rockchip/pm.h index b1e748e619da..7833519562ac 100755 --- a/arch/arm/mach-rockchip/pm.h +++ b/arch/arm/mach-rockchip/pm.h @@ -180,9 +180,9 @@ extern void rkpm_set_sram_ops_pmic(rkpm_ops_void_callback pmic,rkpm_ops_void_cal extern void rkpm_set_sram_ops_ddr(rkpm_ops_void_callback ddr,rkpm_ops_void_callback re_ddr); extern void rkpm_set_sram_ops_printch(rkpm_ops_printch_callback printch); -extern void inline rkpm_set_ctrbits(u32 bits); -extern u32 inline rkpm_get_ctrbits(void); -extern void inline rkpm_clr_ctrbits(u32 bits);//clear +extern void rkpm_set_ctrbits(u32 bits); +extern u32 rkpm_get_ctrbits(void); +extern void rkpm_clr_ctrbits(u32 bits);//clear extern void rkpm_ddr_printch(char byte); extern void rkpm_ddr_printascii(const char *s); diff --git a/arch/arm/mach-rockchip/rockchip_pm.c b/arch/arm/mach-rockchip/rockchip_pm.c index 7d2c14a30b39..c35d696ba34d 100755 --- a/arch/arm/mach-rockchip/rockchip_pm.c +++ b/arch/arm/mach-rockchip/rockchip_pm.c @@ -183,28 +183,28 @@ void rkpm_set_sram_ops_printch(rkpm_ops_printch_callback printch) } /******************for user ************************/ -void inline rkpm_set_ctrbits(u32 bits) +void rkpm_set_ctrbits(u32 bits) { rkpm_ctrbits = bits; } -void inline rkpm_add_ctrbits(u32 bits) +void rkpm_add_ctrbits(u32 bits) { rkpm_ctrbits |= bits; } -u32 inline rkpm_get_ctrbits(void) +u32 rkpm_get_ctrbits(void) { return rkpm_ctrbits; } -u32 inline rkpm_chk_ctrbits(u32 bits) +u32 rkpm_chk_ctrbits(u32 bits) { return (rkpm_ctrbits&bits); } //clear -void inline rkpm_clr_ctrbits(u32 bits) +void rkpm_clr_ctrbits(u32 bits) { rkpm_ctrbits&=~bits; } -- 2.34.1