Subject: [PATCH] Use __always_inline in orinoco_lock()/orinoco_unlock()

From: Pavel Roskin <[email-masked]>
Date: Tue, 15 Aug 2006 15:25:58 -0400

From: Pavel Roskin <[email-masked]>

This is exactly the case when they are needed.  This also fixed a
warning with -Wmissing-prototypes

Signed-off-by: Adrian Bunk <[email-masked]>
Signed-off-by: Pavel Roskin <[email-masked]>
---

 drivers/net/wireless/orinoco.h |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/drivers/net/wireless/orinoco.h b/drivers/net/wireless/orinoco.h
index 16db3e1..8fd9b32 100644
--- a/drivers/net/wireless/orinoco.h
+++ b/drivers/net/wireless/orinoco.h
@@ -135,11 +135,9 @@ extern irqreturn_t orinoco_interrupt(int
 /********************************************************************/
 
 /* These functions *must* be inline or they will break horribly on
- * SPARC, due to its weird semantics for save/restore flags. extern
- * inline should prevent the kernel from linking or module from
- * loading if they are not inlined. */
-extern inline int orinoco_lock(struct orinoco_private *priv,
-			       unsigned long *flags)
+ * SPARC, due to its weird semantics for save/restore flags. */
+static __always_inline int orinoco_lock(struct orinoco_private *priv,
+					unsigned long *flags)
 {
 	spin_lock_irqsave(&priv->lock, *flags);
 	if (priv->hw_unavailable) {
@@ -151,8 +149,8 @@ extern inline int orinoco_lock(struct or
 	return 0;
 }
 
-extern inline void orinoco_unlock(struct orinoco_private *priv,
-				  unsigned long *flags)
+static __always_inline void orinoco_unlock(struct orinoco_private *priv,
+					   unsigned long *flags)
 {
 	spin_unlock_irqrestore(&priv->lock, *flags);
 }