From: Sascha Hauer <s.hauer@pengutronix.de>
To: Barebox List <barebox@lists.infradead.org>
Subject: [PATCH 3/6] ppc: bootm: remove unnecessary parameter
Date: Wed, 6 Jun 2018 09:11:26 +0200 [thread overview]
Message-ID: <20180606071129.28884-4-s.hauer@pengutronix.de> (raw)
In-Reply-To: <20180606071129.28884-1-s.hauer@pengutronix.de>
bootm_relocate_fdt takes the os address as parameter, but this can be
extracted from struct image_data, so drop the parameter.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
arch/ppc/lib/ppclinux.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/arch/ppc/lib/ppclinux.c b/arch/ppc/lib/ppclinux.c
index ed2f769c25..67649f3b46 100644
--- a/arch/ppc/lib/ppclinux.c
+++ b/arch/ppc/lib/ppclinux.c
@@ -14,8 +14,9 @@
#include <restart.h>
#include <fs.h>
-static int bootm_relocate_fdt(void *os, struct image_data *data)
+static int bootm_relocate_fdt(struct image_data *data)
{
+ void *os = (void *)data->os_address;
void *newfdt;
if (os < LINUX_TLB1_MAX_ADDR) {
@@ -73,9 +74,7 @@ static int do_bootm_linux(struct image_data *data)
void *addr = data->oftree;
if ((addr + data->oftree->totalsize) > LINUX_TLB1_MAX_ADDR) {
- addr = (void *)data->os_address;
-
- if (bootm_relocate_fdt(addr, data))
+ if (bootm_relocate_fdt(data))
goto error;
}
}
--
2.17.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2018-06-06 7:12 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-06 7:11 [PATCH 0/6] bootm: split bootm_load_devicetree into two functions Sascha Hauer
2018-06-06 7:11 ` [PATCH 1/6] ARM: bootm: drop usage of data->oftree Sascha Hauer
2018-06-06 7:11 ` [PATCH 2/6] ppc: bootm: rename variables Sascha Hauer
2018-06-06 7:11 ` Sascha Hauer [this message]
2018-06-06 7:11 ` [PATCH 4/6] ppc: bootm: Drop usage of data->oftree Sascha Hauer
2018-06-06 7:11 ` [PATCH 5/6] bootm: Drop data->oftree Sascha Hauer
2018-06-06 7:11 ` [PATCH 6/6] bootm: Split bootm_load_devicetree into two functions Sascha Hauer
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=20180606071129.28884-4-s.hauer@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=barebox@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