]> Pileus Git - ~andy/linux/commitdiff
usb: phy: am335x-control: make it compile with
authorSebastian Andrzej Siewior <bigeasy@linutronix.de>
Fri, 16 Aug 2013 15:32:49 +0000 (17:32 +0200)
committerFelipe Balbi <balbi@ti.com>
Tue, 27 Aug 2013 19:07:50 +0000 (14:07 -0500)
Randy reported this
|drivers/usb/phy/phy-am335x-control.c:45:3: error: implicit declaration
|of function '__WARN' [-Werror=implicit-function-declaration]

and left it as an excercice to figure out that this happens only with
CONFIG_BUG=n. As a fix I replace it with WARN_ON(). And there is a space
before return so fix this, too.

Reported-by: Randy Dunlap <rdunlap@infradead.org>
Acked-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Felipe Balbi <balbi@ti.com>
drivers/usb/phy/phy-am335x-control.c

index 759754521426166e1a280c055b6cf6897b135e06..22cf07d62e4c68f04378b18a70555eb782ba25ff 100644 (file)
@@ -42,8 +42,8 @@ static void am335x_phy_power(struct phy_control *phy_ctrl, u32 id, bool on)
                reg = AM335X_USB1_CTRL;
                break;
        default:
-               __WARN();
-                return;
+               WARN_ON(1);
+               return;
        }
 
        val = readl(usb_ctrl->phy_reg + reg);