leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[ATM]: proper prototypes in net/atm/mpc.h (and reduce ifdef clutter)

Browse Source 
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Adrian Bunk 2006-09-22 14:28:11 -07:00 committed by David S. Miller
parent d458c25ce2
commit 69263bcfb5
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
net/atm/mpc.c
View File

@ -98,11 +98,6 @@ static struct notifier_block mpoa_notifier = {
0 0
}; };
#ifdef CONFIG_PROC_FS
extern int mpc_proc_init(void);
extern void mpc_proc_clean(void);
#endif
struct mpoa_client *mpcs = NULL; /* FIXME */ struct mpoa_client *mpcs = NULL; /* FIXME */
static struct atm_mpoa_qos *qos_head = NULL; static struct atm_mpoa_qos *qos_head = NULL;
static DEFINE_TIMER(mpc_timer, NULL, 0, 0); static DEFINE_TIMER(mpc_timer, NULL, 0, 0);
@ -1439,12 +1434,8 @@ static __init int atm_mpoa_init(void)
{ {
register_atm_ioctl(&atm_ioctl_ops); register_atm_ioctl(&atm_ioctl_ops);
#ifdef CONFIG_PROC_FS
if (mpc_proc_init() != 0) if (mpc_proc_init() != 0)
printk(KERN_INFO "mpoa: failed to initialize /proc/mpoa\n"); printk(KERN_INFO "mpoa: failed to initialize /proc/mpoa\n");
else
printk(KERN_INFO "mpoa: /proc/mpoa initialized\n");
#endif
printk("mpc.c: " __DATE__ " " __TIME__ " initialized\n"); printk("mpc.c: " __DATE__ " " __TIME__ " initialized\n");
@ -1457,9 +1448,7 @@ static void __exit atm_mpoa_cleanup(void)
struct atm_mpoa_qos *qos, *nextqos; struct atm_mpoa_qos *qos, *nextqos;
struct lec_priv *priv; struct lec_priv *priv;
#ifdef CONFIG_PROC_FS
mpc_proc_clean(); mpc_proc_clean();
#endif
del_timer(&mpc_timer); del_timer(&mpc_timer);
unregister_netdevice_notifier(&mpoa_notifier); unregister_netdevice_notifier(&mpoa_notifier);

8
net/atm/mpc.h
View File

@ -50,4 +50,12 @@ int atm_mpoa_delete_qos(struct atm_mpoa_qos *qos);
struct seq_file; struct seq_file;
void atm_mpoa_disp_qos(struct seq_file *m); void atm_mpoa_disp_qos(struct seq_file *m);
#ifdef CONFIG_PROC_FS
int mpc_proc_init(void);
void mpc_proc_clean(void);
#else
#define mpc_proc_init() (0)
#define mpc_proc_clean() do { } while(0)
#endif
#endif /* _MPC_H_ */ #endif /* _MPC_H_ */