Skip to contentSkip to conversation

switch x25_asy over to initcalls

PATCH Applied Christoph Hellwig 2 participants 2 messages May 9, 2003

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 switch x25_asy over to initcalls

I also had to fix the ldisc initialization because it was so ugly and the different ioctl + cast mess because I couldn't look at it.

drivers/net/setup.c +1 -19
@@ -9,8 +9,6 @@
 #include <linux/init.h>
 #include <linux/netlink.h>
 
-extern int x25_asy_init_ctrl_dev(void);
-  
 extern int dmascc_init(void);
 
 extern int arcnet_init(void); 
@@ -101,19 +99,6 @@
 	}
 }
 
-
-/*
- *	Initialise the line discipline drivers
- */
- 
-static void __init network_ldisc_init(void)
-{
-#if defined(CONFIG_X25_ASY)
-	x25_asy_init_ctrl_dev();
-#endif
-}
-
-
 static void __init special_device_init(void)
 {
 #ifdef CONFIG_NET_SB1000
@@ -133,11 +118,8 @@
  
 void __init net_device_init(void)
 {
-	/* Devices supporting the new probing API */
+	/* Devices supporting the new^H^H^Hold probing API */
 	network_probe();
-	/* Line disciplines */
-	network_ldisc_init();
 	/* Special devices */
 	special_device_init();
-	/* That kicks off the legacy init functions */
 }
drivers/net/wan/x25_asy.c +61 -98

210 lines not on this page · raw message

#1 lore raw

From: Christoph Hellwig <[email protected]>
Date: Fri, 9 May 2003 09:12:19 +0200

I also had to fix the ldisc initialization because it was so ugly and the different ioctl + cast mess because I couldn't look at it.

Applied, thanks Christoph.