lkml.org 
[lkml]   [2008]   [Nov]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 4/6] usb: musb: use static inline functions to replace the macros in Blackfin version
Date
As Mike pointed out, "these should be static inline's so that side
effects in function usage dont get messed up. for example, if someone
used a ++ or -- or = operator in the argument list."

So I fixed all musb stubs here, but remain clk_xxx stubs because it needs to
define struck clk. IMO, we might add clk support in the future.

Signed-off-by: Bryan Wu <cooloney@kernel.org>
---
drivers/usb/musb/musb_regs.h | 76 +++++++++++++++++++++++++++++++++---------
1 files changed, 60 insertions(+), 16 deletions(-)

diff --git a/drivers/usb/musb/musb_regs.h b/drivers/usb/musb/musb_regs.h
index 3e50aef..37f90f0 100644
--- a/drivers/usb/musb/musb_regs.h
+++ b/drivers/usb/musb/musb_regs.h
@@ -447,22 +447,66 @@ static inline void musb_write_txhubport(void __iomem *mbase, u8 epnum,
#define clk_enable(clock) do {} while (0)
#define clk_disable(clock) do {} while (0)

-#define musb_write_txfifosz(mbase, c_size) do {} while (0)
-#define musb_write_txfifoadd(mbase, c_off) do {} while (0)
-#define musb_write_rxfifosz(mbase, c_size) do {} while (0)
-#define musb_write_rxfifoadd(mbase, c_off) do {} while (0)
-
-#define musb_read_configdata(mbase) 0
-#define musb_read_hwvers(mbase) 0
-#define musb_read_target_reg_base(i, mbase) 0
-
-#define musb_write_rxfunaddr(ep_target_regs, qh_addr_reg) do {} while (0)
-#define musb_write_rxhubaddr(ep_target_regs, qh_h_addr_reg) do {} while (0)
-#define musb_write_rxhubport(ep_target_regs, qh_h_port_reg) do {} while (0)
-
-#define musb_write_txfunaddr(mbase, epnum, qh_addr_reg) do {} while (0)
-#define musb_write_txhubaddr(mbase, epnum, qh_h_addr_reg) do {} while (0)
-#define musb_write_txhubport(mbase, epnum, qh_h_port_reg) do {} while (0)
+static inline void musb_write_txfifosz(void __iomem *mbase, u8 c_size)
+{
+}
+
+static inline void musb_write_txfifoadd(void __iomem *mbase, u16 c_off)
+{
+}
+
+static inline void musb_write_rxfifosz(void __iomem *mbase, u8 c_size)
+{
+}
+
+static inline void musb_write_rxfifoadd(void __iomem *mbase, u16 c_off)
+{
+}
+
+static inline u8 musb_read_configdata(void __iomem *mbase)
+{
+ return 0;
+}
+
+static inline u16 musb_read_hwvers(void __iomem *mbase)
+{
+ return 0;
+}
+
+static inline u16 musb_read_target_reg_base(u8 i, void __iomem *mbase)
+{
+ return 0;
+}
+
+static inline void musb_write_rxfunaddr(void __iomem *ep_target_regs,
+ u8 qh_addr_req)
+{
+}
+
+static inline void musb_write_rxhubaddr(void __iomem *ep_target_regs,
+ u8 qh_h_addr_reg)
+{
+}
+
+static inline void musb_write_rxhubport(void __iomem *ep_target_regs,
+ u8 qh_h_port_reg)
+{
+}
+
+static inline void musb_write_txfunaddr(void __iomem *mbase, u8 epnum,
+ u8 qh_addr_reg)
+{
+}
+
+static inline void musb_write_txhubaddr(void __iomem *mbase, u8 epnum,
+ u8 qh_addr_reg)
+{
+}
+
+static inline void musb_write_txhubport(void __iomem *mbase, u8 epnum,
+ u8 qh_h_port_reg)
+{
+}

#endif /* CONFIG_BLACKFIN */

--
1.5.6.3

\
 
 \ /
  Last update: 2008-11-18 09:27    [W:0.078 / U:0.044 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site