[tip:x86/olpc] x86, olpc: Constify an olpc_ofw() arg

tip-bot for Andres Salomon
2010-07-31T01:10:27Z

Commit-ID: 54e5bc020ce1c959eaa7be18cedb734b6b13745e
Gitweb: http://git.kernel.org/tip/54e5bc020ce1c959eaa7be18cedb734b6b13745e
Author: Andres Salomon <dilinger@queued.net>
AuthorDate: Mon, 28 Jun 2010 22:00:29 -0400
Committer: H. Peter Anvin <hpa@linux.intel.com>
CommitDate: Fri, 30 Jul 2010 18:02:21 -0700

x86, olpc: Constify an olpc_ofw() arg

The arguments passed to OFW shouldn't be modified; update the 'args'
argument of olpc_ofw to reflect this. This saves us some later
casting away of consts.

Signed-off-by: Andres Salomon <dilinger@queued.net>
LKML-Reference: <20100628220029.1555ac24@debian>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
---
arch/x86/include/asm/olpc_ofw.h | 2 +-
arch/x86/kernel/olpc.c | 2 +-
arch/x86/kernel/olpc_ofw.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/x86/include/asm/olpc_ofw.h b/arch/x86/include/asm/olpc_ofw.h
index 3e63d85..08fde47 100644
--- a/arch/x86/include/asm/olpc_ofw.h
+++ b/arch/x86/include/asm/olpc_ofw.h
@@ -12,7 +12,7 @@
#define olpc_ofw(name, args, res) \
__olpc_ofw((name), ARRAY_SIZE(args), args, ARRAY_SIZE(res), res)

-extern int __olpc_ofw(const char *name, int nr_args, void **args, int nr_res,
+extern int __olpc_ofw(const char *name, int nr_args, const void **args, int nr_res,
void **res);

/* determine whether OFW is available and lives in the proper memory */
diff --git a/arch/x86/kernel/olpc.c b/arch/x86/kernel/olpc.c
index f5ff3903..0e0cdde 100644
--- a/arch/x86/kernel/olpc.c
+++ b/arch/x86/kernel/olpc.c
@@ -188,7 +188,7 @@ static void __init platform_detect(void)
{
size_t propsize;
__be32 rev;
- void *args[] = { NULL, "board-revision-int", &rev, (void *)4 };
+ const void *args[] = { NULL, "board-revision-int", &rev, (void *)4 };
void *res[] = { &propsize };

if (olpc_ofw("getprop", args, res) || propsize != 4) {
diff --git a/arch/x86/kernel/olpc_ofw.c b/arch/x86/kernel/olpc_ofw.c
index f5d499f..3218aa7 100644
--- a/arch/x86/kernel/olpc_ofw.c
+++ b/arch/x86/kernel/olpc_ofw.c
@@ -40,7 +40,7 @@ void __init setup_olpc_ofw_pgd(void)
early_iounmap(base, sizeof(olpc_ofw_pgd) * PTRS_PER_PGD);
}

-int __olpc_ofw(const char *name, int nr_args, void **args, int nr_res,
+int __olpc_ofw(const char *name, int nr_args, const void **args, int nr_res,
void **res)
{
int ofw_args[MAXARGS + 3];