summaryrefslogtreecommitdiffstats
path: root/arch/ppc/lib
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2010-10-13 13:11:09 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2010-10-13 17:39:49 +0200
commita64c756ad96e1ce08ff41b7ce305631bb09929c2 (patch)
tree77bad0bb56879c6ebc5335a3fc140f41acfb145e /arch/ppc/lib
parentb531c53e74ed686947bd45eab22fb4d3b793a33b (diff)
downloadbarebox-a64c756ad96e1ce08ff41b7ce305631bb09929c2.tar.gz
barebox-a64c756ad96e1ce08ff41b7ce305631bb09929c2.tar.xz
image: remove confusing image_check_* functions
The function names do not make it clear what return value is expected and do not save a single line of code. Put the code inline and unbreak the wrong checks introduced with a3c1e5d888d0ee317ffc7635694684bb71213c9c. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Acked-by: Eric BĂ©nard <eric@eukrea.com> Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Diffstat (limited to 'arch/ppc/lib')
-rw-r--r--arch/ppc/lib/ppclinux.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ppc/lib/ppclinux.c b/arch/ppc/lib/ppclinux.c
index 5ee908d132..fc22a87170 100644
--- a/arch/ppc/lib/ppclinux.c
+++ b/arch/ppc/lib/ppclinux.c
@@ -45,7 +45,7 @@ static int do_bootm_linux(struct image_data *idata)
printf("entering %s: os_header: %p initrd_header: %p oftree: %s\n",
__FUNCTION__, os_header, initrd_header, idata->oftree);
- if (image_check_type(os_header, IH_TYPE_MULTI)) {
+ if (image_get_type(os_header) == IH_TYPE_MULTI) {
unsigned long *data = (unsigned long *)(idata->os->data);
unsigned long len1 = 0, len2 = 0;