Commit 3bf7b20a authored by Olof Johansson's avatar Olof Johansson

Merge tag 'mvebu-cleanup-4.3-1' of git://git.infradead.org/linux-mvebu into next/cleanup

Merge "ARM: mvebu: cleanup changes for v4.3" from Gregory Clement:

mvebu cleanup changes for v4.3 (part #1)

- Use vsprintf %pM extension on orion5x board to format mac address
- Add missing newline at end of messages on pr_warn when CPU Idle on
  Armada 38x is disabled

* tag 'mvebu-cleanup-4.3-1' of git://git.infradead.org/linux-mvebu:
  ARM: orion5x: Use vsprintf %pM extension
  ARM: mvebu: add missing newline at end of messages
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 52e43a11 7a1436d5
...@@ -415,7 +415,7 @@ static __init int armada_38x_cpuidle_init(void) ...@@ -415,7 +415,7 @@ static __init int armada_38x_cpuidle_init(void)
void __iomem *mpsoc_base; void __iomem *mpsoc_base;
u32 reg; u32 reg;
pr_warn("CPU idle is currently broken on Armada 38x: disabling"); pr_warn("CPU idle is currently broken on Armada 38x: disabling\n");
return 0; return 0;
np = of_find_compatible_node(NULL, NULL, np = of_find_compatible_node(NULL, NULL,
...@@ -486,7 +486,7 @@ static int __init mvebu_v7_cpu_pm_init(void) ...@@ -486,7 +486,7 @@ static int __init mvebu_v7_cpu_pm_init(void)
*/ */
if (of_machine_is_compatible("marvell,armada380")) { if (of_machine_is_compatible("marvell,armada380")) {
cpu_hotplug_disable(); cpu_hotplug_disable();
pr_warn("CPU hotplug support is currently broken on Armada 38x: disabling"); pr_warn("CPU hotplug support is currently broken on Armada 38x: disabling\n");
} }
if (of_machine_is_compatible("marvell,armadaxp")) if (of_machine_is_compatible("marvell,armadaxp"))
......
...@@ -236,9 +236,7 @@ static int __init dns323_read_mac_addr(void) ...@@ -236,9 +236,7 @@ static int __init dns323_read_mac_addr(void)
} }
iounmap(mac_page); iounmap(mac_page);
printk("DNS-323: Found ethernet MAC address: "); printk("DNS-323: Found ethernet MAC address: %pM\n", addr);
for (i = 0; i < 6; i++)
printk("%.2x%s", addr[i], (i < 5) ? ":" : ".\n");
memcpy(dns323_eth_data.mac_addr, addr, 6); memcpy(dns323_eth_data.mac_addr, addr, 6);
......
...@@ -101,9 +101,7 @@ static int __init qnap_tsx09_check_mac_addr(const char *addr_str) ...@@ -101,9 +101,7 @@ static int __init qnap_tsx09_check_mac_addr(const char *addr_str)
addr[i] = byte; addr[i] = byte;
} }
printk(KERN_INFO "tsx09: found ethernet mac address "); printk(KERN_INFO "tsx09: found ethernet mac address %pM\n", addr);
for (i = 0; i < 6; i++)
printk("%.2x%s", addr[i], (i < 5) ? ":" : ".\n");
memcpy(qnap_tsx09_eth_data.mac_addr, addr, 6); memcpy(qnap_tsx09_eth_data.mac_addr, addr, 6);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment