Merge branch 'for-next/misc'

3 files changed, 24 insertions, 25 deletions

diff --git a/common/bootm.c b/common/bootm.c
index 1199cb7ccc..79833e045d 100644
--- a/common/bootm.c
+++ b/common/bootm.c
@@ -246,7 +246,7 @@ done:
 		printf(", multifile image %s", data->initrd_part);
 	printf("\n");
 done1:
-	printf("initrd is at " PRINTF_CONVERSION_RESOURCE "-" PRINTF_CONVERSION_RESOURCE "\n",
+	printf("initrd is at %pa-%pa\n",
 		data->initrd_res->start,
 		data->initrd_res->end);
 
@@ -456,9 +456,9 @@ static int bootm_open_os_uimage(struct image_data *data)
 static void bootm_print_info(struct image_data *data)
 {
 	if (data->os_res)
-		printf("OS image is at " PRINTF_CONVERSION_RESOURCE "-" PRINTF_CONVERSION_RESOURCE "\n",
-				data->os_res->start,
-				data->os_res->end);
+		printf("OS image is at %pa-%pa\n",
+				&data->os_res->start,
+				&data->os_res->end);
 	else
 		printf("OS image not yet relocated\n");
 }
diff --git a/common/hush.c b/common/hush.c
index 832bc7bdb2..d3f7bf330d 100644
--- a/common/hush.c
+++ b/common/hush.c
@@ -863,29 +863,29 @@ static int run_list_real(struct p_context *ctx, struct pipe *pi)
 		if ((rpipe->r_mode == RES_IN ||
 		    rpipe->r_mode == RES_FOR) &&
 		    (rpipe->next == NULL)) {
-				syntax();
-				return 1;
+			syntax();
+			return 1;
 		}
 		if ((rpipe->r_mode == RES_IN &&
-			(rpipe->next->r_mode == RES_IN &&
-			rpipe->next->progs->argv != NULL))||
-			(rpipe->r_mode == RES_FOR &&
-			rpipe->next->r_mode != RES_IN)) {
-				syntax();
-				return 1;
+				(rpipe->next->r_mode == RES_IN &&
+				rpipe->next->progs->argv != NULL))||
+				(rpipe->r_mode == RES_FOR &&
+				rpipe->next->r_mode != RES_IN)) {
+			syntax();
+			return 1;
 		}
 	}
 	for (; pi; pi = (flag_restore != 0) ? rpipe : pi->next) {
 		if (pi->r_mode == RES_WHILE || pi->r_mode == RES_UNTIL ||
-			pi->r_mode == RES_FOR) {
-				/* check Ctrl-C */
-				if (ctrlc())
-					return 1;
-				flag_restore = 0;
-				if (!rpipe) {
-					flag_rep = 0;
-					rpipe = pi;
-				}
+				pi->r_mode == RES_FOR) {
+			/* check Ctrl-C */
+			if (ctrlc())
+				return 1;
+			flag_restore = 0;
+			if (!rpipe) {
+				flag_rep = 0;
+				rpipe = pi;
+			}
 		}
 		rmode = pi->r_mode;
 		debug("rmode=%d  if_code=%d  next_if_code=%d skip_more=%d\n",
diff --git a/common/uimage.c b/common/uimage.c
index a7011a7623..59d7b65c90 100644
--- a/common/uimage.c
+++ b/common/uimage.c
@@ -354,10 +354,9 @@ static int uimage_sdram_flush(void *buf, unsigned int len)
 		uimage_resource = request_sdram_region("uimage",
 				start, size);
 		if (!uimage_resource) {
-			printf("unable to request SDRAM "
-					PRINTF_CONVERSION_RESOURCE "-"
-					PRINTF_CONVERSION_RESOURCE "\n",
-				start, start + size - 1);
+			resource_size_t prsize = start + size - 1;
+			printf("unable to request SDRAM %pa - %pa\n",
+				&start, &prsize);
 			return -ENOMEM;
 		}
 	}