summaryrefslogtreecommitdiff
path: root/net/atm
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2006-09-22 14:28:11 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2006-09-22 15:19:13 -0700
commit69263bcfb5016bc3bdd099607a4232cba06f8491 (patch)
tree0d147c53de267fec3055bd5cb11a24ce4c936f08 /net/atm
parentd458c25ce24ce00ea547e9976e293e7835416253 (diff)
downloadlinux-3.10-69263bcfb5016bc3bdd099607a4232cba06f8491.tar.gz
linux-3.10-69263bcfb5016bc3bdd099607a4232cba06f8491.tar.bz2
linux-3.10-69263bcfb5016bc3bdd099607a4232cba06f8491.zip
[ATM]: proper prototypes in net/atm/mpc.h (and reduce ifdef clutter)
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>
Diffstat (limited to 'net/atm')
-rw-r--r--net/atm/mpc.c11
-rw-r--r--net/atm/mpc.h8
2 files changed, 8 insertions, 11 deletions
diff --git a/net/atm/mpc.c b/net/atm/mpc.c
index 00704661e83..b87c2a88bdc 100644
--- a/net/atm/mpc.c
+++ b/net/atm/mpc.c
@@ -98,11 +98,6 @@ static struct notifier_block mpoa_notifier = {
0
};
-#ifdef CONFIG_PROC_FS
-extern int mpc_proc_init(void);
-extern void mpc_proc_clean(void);
-#endif
-
struct mpoa_client *mpcs = NULL; /* FIXME */
static struct atm_mpoa_qos *qos_head = NULL;
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);
-#ifdef CONFIG_PROC_FS
if (mpc_proc_init() != 0)
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");
@@ -1457,9 +1448,7 @@ static void __exit atm_mpoa_cleanup(void)
struct atm_mpoa_qos *qos, *nextqos;
struct lec_priv *priv;
-#ifdef CONFIG_PROC_FS
mpc_proc_clean();
-#endif
del_timer(&mpc_timer);
unregister_netdevice_notifier(&mpoa_notifier);
diff --git a/net/atm/mpc.h b/net/atm/mpc.h
index 863ddf6079e..3c7981a229e 100644
--- a/net/atm/mpc.h
+++ b/net/atm/mpc.h
@@ -50,4 +50,12 @@ int atm_mpoa_delete_qos(struct atm_mpoa_qos *qos);
struct seq_file;
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_ */