lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86, olpc: Constify an olpc_ofw() arg

Browse Source 
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>
This commit is contained in:
Andres Salomon
2010-06-28 22:00:29 -04:00
committed by H. Peter Anvin
parent 25971865d4
commit 54e5bc020c
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/include/asm/olpc_ofw.h
View File

@@ -12,7 +12,7 @@
#define olpc_ofw(name, args, res) \ #define olpc_ofw(name, args, res) \
__olpc_ofw((name), ARRAY_SIZE(args), args, ARRAY_SIZE(res), 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); void **res);
/* determine whether OFW is available and lives in the proper memory */ /* determine whether OFW is available and lives in the proper memory */

2
arch/x86/kernel/olpc.c
View File

@@ -188,7 +188,7 @@ static void __init platform_detect(void)
{ {
size_t propsize; size_t propsize;
__be32 rev; __be32 rev;
void *args[] = { NULL, "board-revision-int", &rev, (void *)4 }; const void *args[] = { NULL, "board-revision-int", &rev, (void *)4 };
void *res[] = { &propsize }; void *res[] = { &propsize };
if (olpc_ofw("getprop", args, res) || propsize != 4) { if (olpc_ofw("getprop", args, res) || propsize != 4) {

2
arch/x86/kernel/olpc_ofw.c
View File

@@ -40,7 +40,7 @@ void __init setup_olpc_ofw_pgd(void)
early_iounmap(base, sizeof(olpc_ofw_pgd) * PTRS_PER_PGD); 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) void **res)
{ {
int ofw_args[MAXARGS + 3]; int ofw_args[MAXARGS + 3];