diff options
| author | Olof Johansson | 2019-05-15 23:23:43 -0700 |
|---|---|---|
| committer | Olof Johansson | 2019-05-16 10:53:23 -0700 |
| commit | c32beba325d8c54d8affa158a0a54643ba87eab4 (patch) | |
| tree | ef43a6d12f5fd226607f56a26016081203427633 /arch/arm/mach-mvebu/kirkwood.c | |
| parent | 163d65cbf3bace75f6b0bc83fa4e8ca8795579cf (diff) | |
| parent | 7af2ea3b29b1640f5aafe79d7c110ce66190c04a (diff) | |
Merge tag 'mvebu-arm-5.2-1' of git://git.infradead.org/linux-mvebu into arm/late
mvebu arm for 5.2 (part 1)
- remove improper error message on kirkwood
- a couple a clean-up patch generated from automatic tools
- clean-up in assembly code allowing using LLVM
* tag 'mvebu-arm-5.2-1' of git://git.infradead.org/linux-mvebu:
ARM: mvebu: drop return from void function
ARM: mvebu: prefix coprocessor operand with p
ARM: mvebu: drop unnecessary label
ARM: mvebu: fix a leaked reference by adding missing of_node_put
ARM: mvebu: kirkwood: remove error message when retrieving mac address
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-mvebu/kirkwood.c')
| -rw-r--r-- | arch/arm/mach-mvebu/kirkwood.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-mvebu/kirkwood.c b/arch/arm/mach-mvebu/kirkwood.c index 9b5f4d665374..ceaad6d5927e 100644 --- a/arch/arm/mach-mvebu/kirkwood.c +++ b/arch/arm/mach-mvebu/kirkwood.c @@ -108,8 +108,6 @@ static void __init kirkwood_dt_eth_fixup(void) clk_prepare_enable(clk); /* store MAC address register contents in local-mac-address */ - pr_err(FW_INFO "%pOF: local-mac-address is not set\n", np); - pmac = kzalloc(sizeof(*pmac) + 6, GFP_KERNEL); if (!pmac) goto eth_fixup_no_mem; |