aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/ns83820.c5
-rw-r--r--include/net/bluetooth/rfcomm.h4
-rw-r--r--include/net/sock.h4
3 files changed, 5 insertions, 8 deletions
diff --git a/drivers/net/ns83820.c b/drivers/net/ns83820.c
index ea71f6d82661..972acc3d1276 100644
--- a/drivers/net/ns83820.c
+++ b/drivers/net/ns83820.c
@@ -611,7 +611,7 @@ static inline int rx_refill(struct net_device *ndev, gfp_t gfp)
611 return i ? 0 : -ENOMEM; 611 return i ? 0 : -ENOMEM;
612} 612}
613 613
614static void FASTCALL(rx_refill_atomic(struct net_device *ndev)); 614static void rx_refill_atomic(struct net_device *ndev));
615static void fastcall rx_refill_atomic(struct net_device *ndev) 615static void fastcall rx_refill_atomic(struct net_device *ndev)
616{ 616{
617 rx_refill(ndev, GFP_ATOMIC); 617 rx_refill(ndev, GFP_ATOMIC);
@@ -633,7 +633,6 @@ static inline void clear_rx_desc(struct ns83820 *dev, unsigned i)
633 build_rx_desc(dev, dev->rx_info.descs + (DESC_SIZE * i), 0, 0, CMDSTS_OWN, 0); 633 build_rx_desc(dev, dev->rx_info.descs + (DESC_SIZE * i), 0, 0, CMDSTS_OWN, 0);
634} 634}
635 635
636static void FASTCALL(phy_intr(struct net_device *ndev));
637static void fastcall phy_intr(struct net_device *ndev) 636static void fastcall phy_intr(struct net_device *ndev)
638{ 637{
639 struct ns83820 *dev = PRIV(ndev); 638 struct ns83820 *dev = PRIV(ndev);
@@ -832,7 +831,6 @@ static void ns83820_cleanup_rx(struct ns83820 *dev)
832 } 831 }
833} 832}
834 833
835static void FASTCALL(ns83820_rx_kick(struct net_device *ndev));
836static void fastcall ns83820_rx_kick(struct net_device *ndev) 834static void fastcall ns83820_rx_kick(struct net_device *ndev)
837{ 835{
838 struct ns83820 *dev = PRIV(ndev); 836 struct ns83820 *dev = PRIV(ndev);
@@ -854,7 +852,6 @@ static void fastcall ns83820_rx_kick(struct net_device *ndev)
854/* rx_irq 852/* rx_irq
855 * 853 *
856 */ 854 */
857static void FASTCALL(rx_irq(struct net_device *ndev));
858static void fastcall rx_irq(struct net_device *ndev) 855static void fastcall rx_irq(struct net_device *ndev)
859{ 856{
860 struct ns83820 *dev = PRIV(ndev); 857 struct ns83820 *dev = PRIV(ndev);
diff --git a/include/net/bluetooth/rfcomm.h b/include/net/bluetooth/rfcomm.h
index 25aa575db807..98ec7a320689 100644
--- a/include/net/bluetooth/rfcomm.h
+++ b/include/net/bluetooth/rfcomm.h
@@ -252,8 +252,8 @@ static inline void rfcomm_dlc_put(struct rfcomm_dlc *d)
252 rfcomm_dlc_free(d); 252 rfcomm_dlc_free(d);
253} 253}
254 254
255extern void FASTCALL(__rfcomm_dlc_throttle(struct rfcomm_dlc *d)); 255extern void __rfcomm_dlc_throttle(struct rfcomm_dlc *d);
256extern void FASTCALL(__rfcomm_dlc_unthrottle(struct rfcomm_dlc *d)); 256extern void __rfcomm_dlc_unthrottle(struct rfcomm_dlc *d);
257 257
258static inline void rfcomm_dlc_throttle(struct rfcomm_dlc *d) 258static inline void rfcomm_dlc_throttle(struct rfcomm_dlc *d)
259{ 259{
diff --git a/include/net/sock.h b/include/net/sock.h
index 4ce37ce8c411..416bc994adad 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -774,14 +774,14 @@ do { \
774 lockdep_init_map(&(sk)->sk_lock.dep_map, (name), (key), 0); \ 774 lockdep_init_map(&(sk)->sk_lock.dep_map, (name), (key), 0); \
775} while (0) 775} while (0)
776 776
777extern void FASTCALL(lock_sock_nested(struct sock *sk, int subclass)); 777extern void lock_sock_nested(struct sock *sk, int subclass);
778 778
779static inline void lock_sock(struct sock *sk) 779static inline void lock_sock(struct sock *sk)
780{ 780{
781 lock_sock_nested(sk, 0); 781 lock_sock_nested(sk, 0);
782} 782}
783 783
784extern void FASTCALL(release_sock(struct sock *sk)); 784extern void release_sock(struct sock *sk);
785 785
786/* BH context may only use the following locking interface. */ 786/* BH context may only use the following locking interface. */
787#define bh_lock_sock(__sk) spin_lock(&((__sk)->sk_lock.slock)) 787#define bh_lock_sock(__sk) spin_lock(&((__sk)->sk_lock.slock))