diff options
| author | Cédric Le Goater <clg@fr.ibm.com> | 2014-04-24 09:23:29 +0200 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-04-28 17:35:39 +1000 |
| commit | 9cc36bb0aca622539be59266012d8be4346f0996 (patch) | |
| tree | 613f836ac50d94eeed3723105451789ede639d02 | |
| parent | 926e6940f54313813d177b5cfb9ec31a441cd259 (diff) | |
| download | op-kernel-dev-9cc36bb0aca622539be59266012d8be4346f0996.zip op-kernel-dev-9cc36bb0aca622539be59266012d8be4346f0996.tar.gz | |
powerpc/boot: Add PROM_ERROR define in oflib
This is mostly useful to make to the boot wrapper code closer with
the kernel code in prom_init.
Signed-off-by: Cédric Le Goater <clg@fr.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
| -rw-r--r-- | arch/powerpc/boot/of.h | 2 | ||||
| -rw-r--r-- | arch/powerpc/boot/oflib.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/arch/powerpc/boot/of.h b/arch/powerpc/boot/of.h index 40d95bf..0f058ef 100644 --- a/arch/powerpc/boot/of.h +++ b/arch/powerpc/boot/of.h @@ -23,4 +23,6 @@ typedef u32 __be32; #define cpu_to_be32(x) (x) #define be32_to_cpu(x) (x) +#define PROM_ERROR (-1u) + #endif /* _PPC_BOOT_OF_H_ */ diff --git a/arch/powerpc/boot/oflib.c b/arch/powerpc/boot/oflib.c index 0f72b1a..7f61f2e 100644 --- a/arch/powerpc/boot/oflib.c +++ b/arch/powerpc/boot/oflib.c @@ -55,7 +55,7 @@ int of_call_prom(const char *service, int nargs, int nret, ...) args.args[nargs+i] = 0; if (prom(&args) < 0) - return -1; + return PROM_ERROR; return (nret > 0) ? be32_to_cpu(args.args[nargs]) : 0; } @@ -80,9 +80,9 @@ static int of_call_prom_ret(const char *service, int nargs, int nret, args.args[nargs+i] = 0; if (prom(&args) < 0) - return -1; + return PROM_ERROR; - if (rets != (void *) 0) + if (rets != NULL) for (i = 1; i < nret; ++i) rets[i-1] = be32_to_cpu(args.args[nargs+i]); |
