From: Ian Jeffray <ian@jeffray.co.uk>
Date: Sat, 23 Oct 2010 10:11:56 +0000 (-0500)
Subject: USB: musb: blackfin: fix musb_read_txhubport() definition
X-Git-Tag: v2.6.37-rc2~23^2~12^2~8
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=5d726f5add3af537952f7c35fdaebab43b718c2d;p=~shefty%2Frdma-dev.git

USB: musb: blackfin: fix musb_read_txhubport() definition

The new MUSB power code needs musb_read_txhubport() to
return a value (so stub it as 0 like the other Blackfin
hub funcs).

Signed-off-by: Ian Jeffray <ian@jeffray.co.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Felipe Balbi <balbi@ti.com>
---

diff --git a/drivers/usb/musb/musb_regs.h b/drivers/usb/musb/musb_regs.h
index 244267527a6..5a727c5b867 100644
--- a/drivers/usb/musb/musb_regs.h
+++ b/drivers/usb/musb/musb_regs.h
@@ -633,8 +633,9 @@ static inline u8  musb_read_txhubaddr(void __iomem *mbase, u8 epnum)
 	return 0;
 }
 
-static inline void  musb_read_txhubport(void __iomem *mbase, u8 epnum)
+static inline u8 musb_read_txhubport(void __iomem *mbase, u8 epnum)
 {
+	return 0;
 }
 
 #endif /* CONFIG_BLACKFIN */