Fix comment and change print(KERN_ERR...) into pr_err

diff --git a/arch/arm/mach-kirkwood/tk71-setup.c b/arch/arm/mach-kirkwood/tk71-setup.c
index 57e347073fb5bcb8f8dfc0bd4e3c0ce1921f449d..1966a12b653fd6bbef2da2a7fb42a519c364b129 100644 (file)
--- a/arch/arm/mach-kirkwood/tk71-setup.c
+++ b/arch/arm/mach-kirkwood/tk71-setup.c
@@ -54,7 +54,7 @@ static struct mv643xx_eth_platform_data tk71_ge00_data = {
 };
 
 static struct mv643xx_eth_platform_data tk71_ge01_data = {
-       .phy_addr       = MV643XX_ETH_PHY_ADDR(/*24*/ 28),
+       .phy_addr       = MV643XX_ETH_PHY_ADDR(28),
        /* in case a hardcoded MAC address is needed uncomment next line */
        /* .mac_addr    = {0x00, 0x0c, 0xc6, 0x76, 0x76, 0x2c}, */
 };
@@ -117,8 +117,8 @@ static void __init tk71_init(void)
 
        /* eth1 */
        if (gpio_request(28, "PHY2 reset") != 0 ||
-               gpio_direction_input(28) != 0) // high-z
-               printk(KERN_ERR "can't deassert GPIO 28 (PHY2 reset)\n");
+               gpio_direction_input(28) != 0) /* high-z */
+               pr_err("can't deassert GPIO 28 (PHY2 reset)\n");
        else
                kirkwood_ge01_init(&tk71_ge01_data);
 
@@ -128,7 +128,7 @@ static void __init tk71_init(void)
 
        if (gpio_request(34, "SDIO Power Enable") != 0 ||
                gpio_direction_output(34, 0) != 0) /* low active */
-               printk(KERN_ERR "can't set up GPIO 34 (SDIO Power Enable)\n");
+               pr_err("can't set up GPIO 34 (SDIO Power Enable)\n");
        kirkwood_sdio_init(&tk71_mvsdio_data);
 }