summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkevans <kevans@FreeBSD.org>2018-02-02 14:47:25 +0000
committerkevans <kevans@FreeBSD.org>2018-02-02 14:47:25 +0000
commit95dd5889f9f9b98296ec67cf8516c96098b8309b (patch)
tree67bbe642d0d7afa5415934931a5a53d4eae7665b
parent52526a38bdff4a98f2d9080ef5340ced36bcc2cb (diff)
downloadFreeBSD-src-95dd5889f9f9b98296ec67cf8516c96098b8309b.zip
FreeBSD-src-95dd5889f9f9b98296ec67cf8516c96098b8309b.tar.gz
MFC r328584: stand/fdt: Remove unused write-only new_fdtp, correct comment
This is effectively a direct commit to stable/11 due to path restructuring in HEAD. The diff against HEAD has simply been applied to the old path.
-rw-r--r--sys/boot/fdt/fdt_loader_cmd.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/boot/fdt/fdt_loader_cmd.c b/sys/boot/fdt/fdt_loader_cmd.c
index 6cad78f..9366b74 100644
--- a/sys/boot/fdt/fdt_loader_cmd.c
+++ b/sys/boot/fdt/fdt_loader_cmd.c
@@ -379,7 +379,6 @@ fdt_apply_overlays()
size_t max_overlay_size, next_fdtp_size;
size_t current_fdtp_size;
void *current_fdtp;
- void *new_fdtp;
void *next_fdtp;
void *overlay;
int rv;
@@ -387,7 +386,6 @@ fdt_apply_overlays()
if ((fdtp == NULL) || (fdtp_size == 0))
return;
- new_fdtp = NULL;
max_overlay_size = 0;
for (fp = file_findfile(NULL, "dtbo"); fp != NULL; fp = fp->f_next) {
if (max_overlay_size < fp->f_size)
@@ -424,7 +422,7 @@ fdt_apply_overlays()
continue;
}
COPYOUT(fp->f_addr, overlay, fp->f_size);
- /* Both overlay and new_fdtp may be modified in place */
+ /* Both overlay and next_fdtp may be modified in place */
rv = fdt_overlay_apply(next_fdtp, overlay);
if (rv == 0) {
/* Rotate next -> current */
OpenPOWER on IntegriCloud