2021-06-16 09:29:31

by Geert Uytterhoeven

Subject: [PATCH 2/3] of: Remove superfluous casts when printing u64 values

"u64" is "unsigned long long" on all architectures now. Hence there is
no longer a need to use casts when formatting using the "ll" length
modifier.

Signed-off-by: Geert Uytterhoeven <[email protected]>
---
drivers/of/address.c | 14 ++++----------
drivers/of/fdt.c | 6 ++----
2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/drivers/of/address.c b/drivers/of/address.c
index 350b2baa0af38497..c04fce0fb1790cb6 100644
--- a/drivers/of/address.c
+++ b/drivers/of/address.c
@@ -78,9 +78,7 @@ static u64 of_bus_default_map(__be32 *addr, const __be32 *range,
s = of_read_number(range + na + pna, ns);
da = of_read_number(addr, na);

- pr_debug("default map, cp=%llx, s=%llx, da=%llx\n",
- (unsigned long long)cp, (unsigned long long)s,
- (unsigned long long)da);
+ pr_debug("default map, cp=%llx, s=%llx, da=%llx\n", cp, s, da);

if (da < cp || da >= (cp + s))
return OF_BAD_ADDR;
@@ -187,9 +185,7 @@ static u64 of_bus_pci_map(__be32 *addr, const __be32 *range, int na, int ns,
s = of_read_number(range + na + pna, ns);
da = of_read_number(addr + 1, na - 1);

- pr_debug("PCI map, cp=%llx, s=%llx, da=%llx\n",
- (unsigned long long)cp, (unsigned long long)s,
- (unsigned long long)da);
+ pr_debug("PCI map, cp=%llx, s=%llx, da=%llx\n", cp, s, da);

if (da < cp || da >= (cp + s))
return OF_BAD_ADDR;
@@ -302,9 +298,7 @@ static u64 of_bus_isa_map(__be32 *addr, const __be32 *range, int na, int ns,
s = of_read_number(range + na + pna, ns);
da = of_read_number(addr + 1, na - 1);

- pr_debug("ISA map, cp=%llx, s=%llx, da=%llx\n",
- (unsigned long long)cp, (unsigned long long)s,
- (unsigned long long)da);
+ pr_debug("ISA map, cp=%llx, s=%llx, da=%llx\n", cp, s, da);

if (da < cp || da >= (cp + s))
return OF_BAD_ADDR;
@@ -459,7 +453,7 @@ static int of_translate_one(struct device_node *parent, struct of_bus *bus,

finish:
of_dump_addr("parent translation for:", addr, pna);
- pr_debug("with offset: %llx\n", (unsigned long long)offset);
+ pr_debug("with offset: %llx\n", offset);

/* Translate it into parent bus space */
return pbus->translate(addr, offset, pna);
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index 970fa8cdc9303195..344f16bb04ccf081 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -900,8 +900,7 @@ static void __init early_init_dt_check_for_initrd(unsigned long node)
phys_initrd_start = start;
phys_initrd_size = end - start;

- pr_debug("initrd_start=0x%llx initrd_end=0x%llx\n",
- (unsigned long long)start, (unsigned long long)end);
+ pr_debug("initrd_start=0x%llx initrd_end=0x%llx\n", start, end);
}
#else
static inline void early_init_dt_check_for_initrd(unsigned long node)
@@ -1027,8 +1026,7 @@ int __init early_init_dt_scan_memory(unsigned long node, const char *uname,

if (size == 0)
continue;
- pr_debug(" - %llx , %llx\n", (unsigned long long)base,
- (unsigned long long)size);
+ pr_debug(" - %llx, %llx\n", base, size);

early_init_dt_add_memory_arch(base, size);

--
2.25.1

2021-06-17 02:05:20

by Rob Herring (Arm)

Subject: Re: [PATCH 2/3] of: Remove superfluous casts when printing u64 values

On Wed, 16 Jun 2021 11:27:45 +0200, Geert Uytterhoeven wrote:
> "u64" is "unsigned long long" on all architectures now. Hence there is
> no longer a need to use casts when formatting using the "ll" length
> modifier.
>
> Signed-off-by: Geert Uytterhoeven <[email protected]>
> ---
> drivers/of/address.c | 14 ++++----------
> drivers/of/fdt.c | 6 ++----
> 2 files changed, 6 insertions(+), 14 deletions(-)
>

Applied, thanks!