From: felipe.balbi@nokia.com (Felipe Balbi)
To: linux-arm-kernel@lists.infradead.org
Subject: [patch-v2.6.33-rc2+ 05/12] arm: omap: gpmc: kill compile warning
Date: Wed, 30 Dec 2009 00:51:25 +0200 [thread overview]
Message-ID: <1262127092-14878-6-git-send-email-felipe.balbi@nokia.com> (raw)
In-Reply-To: <1262127092-14878-1-git-send-email-felipe.balbi@nokia.com>
Get rid of the following warnings:
arch/arm/mach-omap2/gpmc.c:550:30: warning: non-ANSI
function declaration of function 'omap3_gpmc_save_context'
arch/arm/mach-omap2/gpmc.c:581:33: warning: non-ANSI
function declaration of function 'omap3_gpmc_restore_context'
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
arch/arm/mach-omap2/gpmc.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c
index bd8cb59..32f2c51 100644
--- a/arch/arm/mach-omap2/gpmc.c
+++ b/arch/arm/mach-omap2/gpmc.c
@@ -547,9 +547,10 @@ void __init gpmc_init(void)
#ifdef CONFIG_ARCH_OMAP3
static struct omap3_gpmc_regs gpmc_context;
-void omap3_gpmc_save_context()
+void omap3_gpmc_save_context(void)
{
int i;
+
gpmc_context.sysconfig = gpmc_read_reg(GPMC_SYSCONFIG);
gpmc_context.irqenable = gpmc_read_reg(GPMC_IRQENABLE);
gpmc_context.timeout_ctrl = gpmc_read_reg(GPMC_TIMEOUT_CONTROL);
@@ -578,9 +579,10 @@ void omap3_gpmc_save_context()
}
}
-void omap3_gpmc_restore_context()
+void omap3_gpmc_restore_context(void)
{
int i;
+
gpmc_write_reg(GPMC_SYSCONFIG, gpmc_context.sysconfig);
gpmc_write_reg(GPMC_IRQENABLE, gpmc_context.irqenable);
gpmc_write_reg(GPMC_TIMEOUT_CONTROL, gpmc_context.timeout_ctrl);
--
1.6.6.35.g1d85d
next prev parent reply other threads:[~2009-12-29 22:51 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-29 22:51 [patch-v2.6.33-rc2+ 00/12] arm omap patches for next -rc Felipe Balbi
2009-12-29 22:51 ` [patch-v2.6.33-rc2+ 01/12] arm: omap: musb: ioremap only what's ours Felipe Balbi
2009-12-29 23:51 ` Felipe Balbi
2009-12-29 22:51 ` [patch-v2.6.33-rc2+ 02/12] arm: omap: musb: fix board power budget by passing it to usb_musb_init Felipe Balbi
2009-12-29 22:51 ` [patch-v2.6.33-rc2+ 03/12] arm: omap: musb: fix board mode " Felipe Balbi
2009-12-29 22:51 ` [patch-v2.6.33-rc2+ 04/12] arm: omap1: mailbox: kill compile warning Felipe Balbi
2009-12-29 22:51 ` Felipe Balbi [this message]
2009-12-29 22:51 ` [patch-v2.6.33-rc2+ 06/12] arm: omap: kill compile warning in irq.c Felipe Balbi
2010-01-05 20:20 ` Tony Lindgren
2009-12-29 22:51 ` [patch-v2.6.33-rc2+ 07/12] arm: omap: remove unused variables Felipe Balbi
2009-12-29 22:51 ` [patch-v2.6.33-rc2+ 08/12] arm: omap: io: kill compile warning Felipe Balbi
2009-12-29 22:51 ` [patch-v2.6.33-rc2+ 09/12] arm: omap: kill compile warning on board-4430-sdp.c Felipe Balbi
2009-12-29 22:51 ` [patch-v2.6.33-rc2+ 10/12] arm: omap: gpio: kill compile warning in gpio.c Felipe Balbi
2010-01-05 20:20 ` Tony Lindgren
2009-12-29 22:51 ` [patch-v2.6.33-rc2+ 11/12] arm: omap: mailbox: kill compile warning in mailbox.c Felipe Balbi
2009-12-29 22:51 ` [patch-v2.6.33-rc2+ 12/12] arm: omap: perseus: kill compile warning on board-perseus2.c Felipe Balbi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1262127092-14878-6-git-send-email-felipe.balbi@nokia.com \
--to=felipe.balbi@nokia.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).