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 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iEYEABECAAYFAlWntPEACgkQCwYYjhRyO9UmrACfWVzh1pwm0DQxU3wDt9f09U/R ucAAn1Orsa2uevm9ksPtePrNNc8Pvmd9 =dreI -----END PGP SIGNATURE----- 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: Olof Johansson <olof@lixom.net>
This commit is contained in:
Коммит
3bf7b20a0e
|
@ -415,7 +415,7 @@ static __init int armada_38x_cpuidle_init(void)
|
|||
void __iomem *mpsoc_base;
|
||||
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;
|
||||
|
||||
np = of_find_compatible_node(NULL, NULL,
|
||||
|
@ -486,7 +486,7 @@ static int __init mvebu_v7_cpu_pm_init(void)
|
|||
*/
|
||||
if (of_machine_is_compatible("marvell,armada380")) {
|
||||
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"))
|
||||
|
|
|
@ -236,9 +236,7 @@ static int __init dns323_read_mac_addr(void)
|
|||
}
|
||||
|
||||
iounmap(mac_page);
|
||||
printk("DNS-323: Found ethernet MAC address: ");
|
||||
for (i = 0; i < 6; i++)
|
||||
printk("%.2x%s", addr[i], (i < 5) ? ":" : ".\n");
|
||||
printk("DNS-323: Found ethernet MAC address: %pM\n", addr);
|
||||
|
||||
memcpy(dns323_eth_data.mac_addr, addr, 6);
|
||||
|
||||
|
|
|
@ -101,9 +101,7 @@ static int __init qnap_tsx09_check_mac_addr(const char *addr_str)
|
|||
addr[i] = byte;
|
||||
}
|
||||
|
||||
printk(KERN_INFO "tsx09: found ethernet mac address ");
|
||||
for (i = 0; i < 6; i++)
|
||||
printk("%.2x%s", addr[i], (i < 5) ? ":" : ".\n");
|
||||
printk(KERN_INFO "tsx09: found ethernet mac address %pM\n", addr);
|
||||
|
||||
memcpy(qnap_tsx09_eth_data.mac_addr, addr, 6);
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче