[ATM]: proper prototypes in net/atm/mpc.h (and reduce ifdef clutter) (69263bcf) · Commits · 戴 / test

net/atm/mpc.c

+0 −11

Original line number	Diff line number	Diff line
		@@ -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);

+8 −0

Original line number	Diff line number	Diff line
		@@ -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_ */