diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-01-15 15:31:13 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-01-15 15:33:59 +0100 |
| commit | e2306ada3ee62a9dcf82c072477d9eeeb8bbede3 (patch) | |
| tree | 638bfbfbda2bf6fa1711c26d6d1566bc8f9888ed /commands | |
| parent | 7f2e215fcfce225a3e6e09a0364693e2ada0cdd2 (diff) | |
| download | barebox-e2306ada3ee62a9dcf82c072477d9eeeb8bbede3.tar.gz barebox-e2306ada3ee62a9dcf82c072477d9eeeb8bbede3.tar.xz | |
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 <s.hauer@pengutronix.de>
Diffstat (limited to 'commands')
| -rw-r--r-- | commands/devinfo.c | 8 | ||||
| -rw-r--r-- | commands/iomemport.c | 6 |
2 files changed, 8 insertions, 6 deletions
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); |