net/wanrouter/wanmain.c: cleanups
Subsystems (2)
PATCH 1/1 net/wanrouter/wanmain.c: cleanups
This patch contains the following cleanups:
- make the following needlessly global functions static:
- lock_adapter_irq()
- unlock_adapter_irq()
- #if 0 the following unused global functions:
- wanrouter_encapsulate()
- wanrouter_type_trans()
Signed-off-by Adrian Bunk <[email protected]>
---
This patch was already sent on:
- 12 Dec 2006
- 30 Jun 2006
- 5 Apr 2006
include/linux/wanrouter.h | 8 -------- net/wanrouter/wanmain.c | 17 ++++++++--------- 2 files changed, 8 insertions(+), 17 deletions(-)
include/linux/wanrouter.h renamed from include/linux/wanrouter.h.old +0 -8
@@ -516,9 +516,6 @@/* Public functions available for device drivers */ extern int register_wan_device (struct wan_device *wandev);extern int unregister_wan_device (char *name); -__be16 wanrouter_type_trans (struct sk_buff *skb,struct net_device *dev); -int wanrouter_encapsulate (struct sk_buff *skb,struct net_device *dev, -unsigned short type);/* Proc interface functions. These must not be called by the drivers! */ extern int wanrouter_proc_init (void );
@@ -527,11 +524,6 @@extern int wanrouter_proc_delete (struct wan_device *wandev);extern int wanrouter_ioctl (struct inode *inode,struct file *file,unsigned int cmd,unsigned long arg); -extern void lock_adapter_irq (spinlock_t *lock,unsigned long *smp_flags); -extern void unlock_adapter_irq (spinlock_t *lock,unsigned long *smp_flags); - - -/* Public Data */ /* list of registered devices */ extern struct wan_device *wanrouter_router_devlist;
net/wanrouter/wanmain.c renamed from net/wanrouter/wanmain.c.old +8 -9
@@ -144,8 +144,8 @@static struct wan_device *wanrouter_find_device (char *name);static int wanrouter_delete_interface (struct wan_device *wandev,char *name); -void lock_adapter_irq (spinlock_t *lock,unsigned long *smp_flags); -void unlock_adapter_irq (spinlock_t *lock,unsigned long *smp_flags); +static void lock_adapter_irq (spinlock_t *lock,unsigned long *smp_flags); +static void unlock_adapter_irq (spinlock_t *lock,unsigned long *smp_flags);
@@ -162,8 +162,8 @@* Organize Unique Identifiers for encapsulation/decapsulation */ -static unsigned char wanrouter_oui_ether[] = {0x00 ,0x00 ,0x00 };#if 0 +static unsigned char wanrouter_oui_ether[] = {0x00 ,0x00 ,0x00 };static unsigned char wanrouter_oui_802_2[] = {0x00 ,0x80 ,0xC2 };#endif
@@ -304,6 +304,8 @@return 0 ; } +#if 0 +/* * Encapsulate packet. *
@@ -399,6 +401,7 @@ return ethertype; } +#endif /* 0 */ /* * WAN device IOCTL.
@@ -860,23 +863,19 @@return 0 ; } -void lock_adapter_irq (spinlock_t *lock,unsigned long *smp_flags) +static void lock_adapter_irq (spinlock_t *lock,unsigned long *smp_flags) {spin_lock_irqsave (lock, *smp_flags); } -void unlock_adapter_irq (spinlock_t *lock,unsigned long *smp_flags) +static void unlock_adapter_irq (spinlock_t *lock,unsigned long *smp_flags) {spin_unlock_irqrestore (lock, *smp_flags); }EXPORT_SYMBOL (register_wan_device);EXPORT_SYMBOL (unregister_wan_device); -EXPORT_SYMBOL (wanrouter_encapsulate); -EXPORT_SYMBOL (wanrouter_type_trans); -EXPORT_SYMBOL (lock_adapter_irq); -EXPORT_SYMBOL (unlock_adapter_irq);MODULE_LICENSE ("GPL" );
Quoted 4 lines · Adrian Bunk
This patch contains the following cleanups:
- make the following needlessly global functions static:
-lock_adapter_irq()
-unlock_adapter_irq()
These are 1:1 wrappers around spinlock_irqsave/restore. Just remove them.