ARM: orion5x: Convert pr_warning to pr_warn
Use the more common pr_warn. Other miscellanea: o Realign arguments Signed-off-by: Joe Perches <joe@perches.com> Acked-by: Andrew Lunn <andrew@lunn.ch> Link: https://lkml.kernel.org/r/b438c7c54306f095a150e50df41fbba4d515c2f8.1410632835.git.joe@perches.com Signed-off-by: Jason Cooper <jason@lakedaemon.net>
This commit is contained in:
parent
7d1311b93e
commit
9d06d34bcc
|
@ -550,7 +550,7 @@ static int __init dns323_identify_rev(void)
|
|||
break;
|
||||
}
|
||||
if (i >= 1000) {
|
||||
pr_warning("DNS-323: Timeout accessing PHY, assuming rev B1\n");
|
||||
pr_warn("DNS-323: Timeout accessing PHY, assuming rev B1\n");
|
||||
return DNS323_REV_B1;
|
||||
}
|
||||
writel((3 << 21) /* phy ID reg */ |
|
||||
|
@ -562,7 +562,7 @@ static int __init dns323_identify_rev(void)
|
|||
break;
|
||||
}
|
||||
if (i >= 1000) {
|
||||
pr_warning("DNS-323: Timeout reading PHY, assuming rev B1\n");
|
||||
pr_warn("DNS-323: Timeout reading PHY, assuming rev B1\n");
|
||||
return DNS323_REV_B1;
|
||||
}
|
||||
pr_debug("DNS-323: Ethernet PHY ID 0x%x\n", reg & 0xffff);
|
||||
|
@ -577,8 +577,8 @@ static int __init dns323_identify_rev(void)
|
|||
case 0x0e10: /* MV88E1118 */
|
||||
return DNS323_REV_C1;
|
||||
default:
|
||||
pr_warning("DNS-323: Unknown PHY ID 0x%04x, assuming rev B1\n",
|
||||
reg & 0xffff);
|
||||
pr_warn("DNS-323: Unknown PHY ID 0x%04x, assuming rev B1\n",
|
||||
reg & 0xffff);
|
||||
}
|
||||
return DNS323_REV_B1;
|
||||
}
|
||||
|
|
|
@ -349,7 +349,7 @@ static void __init tsp2_init(void)
|
|||
gpio_free(TSP2_RTC_GPIO);
|
||||
}
|
||||
if (tsp2_i2c_rtc.irq == 0)
|
||||
pr_warning("tsp2_init: failed to get RTC IRQ\n");
|
||||
pr_warn("tsp2_init: failed to get RTC IRQ\n");
|
||||
i2c_register_board_info(0, &tsp2_i2c_rtc, 1);
|
||||
|
||||
/* register Terastation Pro II specific power-off method */
|
||||
|
|
|
@ -314,7 +314,7 @@ static void __init qnap_ts209_init(void)
|
|||
gpio_free(TS209_RTC_GPIO);
|
||||
}
|
||||
if (qnap_ts209_i2c_rtc.irq == 0)
|
||||
pr_warning("qnap_ts209_init: failed to get RTC IRQ\n");
|
||||
pr_warn("qnap_ts209_init: failed to get RTC IRQ\n");
|
||||
i2c_register_board_info(0, &qnap_ts209_i2c_rtc, 1);
|
||||
|
||||
/* register tsx09 specific power-off method */
|
||||
|
|
|
@ -302,7 +302,7 @@ static void __init qnap_ts409_init(void)
|
|||
gpio_free(TS409_RTC_GPIO);
|
||||
}
|
||||
if (qnap_ts409_i2c_rtc.irq == 0)
|
||||
pr_warning("qnap_ts409_init: failed to get RTC IRQ\n");
|
||||
pr_warn("qnap_ts409_init: failed to get RTC IRQ\n");
|
||||
i2c_register_board_info(0, &qnap_ts409_i2c_rtc, 1);
|
||||
platform_device_register(&ts409_leds);
|
||||
|
||||
|
|
|
@ -403,8 +403,8 @@ static void ts78xx_fpga_supports(void)
|
|||
/* enable devices if magic matches */
|
||||
switch ((ts78xx_fpga.id >> 8) & 0xffffff) {
|
||||
case TS7800_FPGA_MAGIC:
|
||||
pr_warning("unrecognised FPGA revision 0x%.2x\n",
|
||||
ts78xx_fpga.id & 0xff);
|
||||
pr_warn("unrecognised FPGA revision 0x%.2x\n",
|
||||
ts78xx_fpga.id & 0xff);
|
||||
ts78xx_fpga.supports.ts_rtc.present = 1;
|
||||
ts78xx_fpga.supports.ts_nand.present = 1;
|
||||
ts78xx_fpga.supports.ts_rng.present = 1;
|
||||
|
|
Loading…
Reference in New Issue