[PATCH] usb: phy: am335x-control: make it compile with

From: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
To: Felipe Balbi <balbi@ti.com>
Cc: Randy Dunlap <rdunlap@infradead.org>,
	Roger Quadros <rogerq@ti.com>,
	Stephen Rothwell <sfr@canb.auug.org.au>,
	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	USB list <linux-usb@vger.kernel.org>,
	Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Subject: [PATCH] usb: phy: am335x-control: make it compile with
Date: Fri, 16 Aug 2013 17:32:49 +0200	[thread overview]
Message-ID: <20130816153249.GA3570@breakpoint.cc> (raw)
In-Reply-To: <520E0304.5050906@ti.com>

From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>

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>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
---
 drivers/usb/phy/phy-am335x-control.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/phy/phy-am335x-control.c b/drivers/usb/phy/phy-am335x-control.c
index 7597545..22cf07d 100644
--- a/drivers/usb/phy/phy-am335x-control.c
+++ b/drivers/usb/phy/phy-am335x-control.c
@@ -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);
-- 
1.8.4.rc2

