From e2306ada3ee62a9dcf82c072477d9eeeb8bbede3 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Fri, 15 Jan 2016 15:31:13 +0100 Subject: Convert users of PRINTF_CONVERSION_RESOURCE to %pa printf now supports printing resource_size_t directly, convert all users of the previously used PRINTF_CONVERSION_RESOURCE over to %pa. Signed-off-by: Sascha Hauer --- commands/devinfo.c | 8 +++++--- commands/iomemport.c | 6 +++--- 2 files changed, 8 insertions(+), 6 deletions(-) (limited to 'commands') diff --git a/commands/devinfo.c b/commands/devinfo.c index c78efcbed4..9d5e8b86eb 100644 --- a/commands/devinfo.c +++ b/commands/devinfo.c @@ -77,13 +77,15 @@ static int do_devinfo(int argc, char *argv[]) if (dev->num_resources) printf("Resources:\n"); for (i = 0; i < dev->num_resources; i++) { + resource_size_t size; res = &dev->resource[i]; + size = resource_size(res); printf(" num: %d\n", i); if (res->name) printf(" name: %s\n", res->name); - printf(" start: " PRINTF_CONVERSION_RESOURCE "\n" - " size: " PRINTF_CONVERSION_RESOURCE "\n", - res->start, resource_size(res)); + printf(" start: %pa\n" + " size: %pa\n", + &res->start, &size); } if (dev->driver) diff --git a/commands/iomemport.c b/commands/iomemport.c index 5294c13b81..6d97c5711b 100644 --- a/commands/iomemport.c +++ b/commands/iomemport.c @@ -22,14 +22,14 @@ static void __print_resources(struct resource *res, int indent) { struct resource *r; + resource_size_t size = resource_size(res); int i; for (i = 0; i < indent; i++) printf(" "); - printf(PRINTF_CONVERSION_RESOURCE " - " PRINTF_CONVERSION_RESOURCE - " (size " PRINTF_CONVERSION_RESOURCE ") %s\n", - res->start, res->end, resource_size(res), res->name); + printf("%pa - %pa (size %pa) %s\n", + &res->start, &res->end, &size, res->name); list_for_each_entry(r, &res->children, sibling) __print_resources(r, indent + 1); -- cgit v1.2.3