diff options
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/ibmveth.c | 6 | ||||
-rw-r--r-- | drivers/net/irda/vlsi_ir.c | 4 | ||||
-rw-r--r-- | drivers/net/pppoe.c | 4 | ||||
-rw-r--r-- | drivers/net/sk98lin/skge.c | 8 |
4 files changed, 11 insertions, 11 deletions
diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c index 32d5fabd4b10..a2c4dd4fb221 100644 --- a/drivers/net/ibmveth.c +++ b/drivers/net/ibmveth.c | |||
@@ -99,7 +99,7 @@ static irqreturn_t ibmveth_interrupt(int irq, void *dev_instance, struct pt_regs | |||
99 | static inline void ibmveth_schedule_replenishing(struct ibmveth_adapter*); | 99 | static inline void ibmveth_schedule_replenishing(struct ibmveth_adapter*); |
100 | 100 | ||
101 | #ifdef CONFIG_PROC_FS | 101 | #ifdef CONFIG_PROC_FS |
102 | #define IBMVETH_PROC_DIR "ibmveth" | 102 | #define IBMVETH_PROC_DIR "net/ibmveth" |
103 | static struct proc_dir_entry *ibmveth_proc_dir; | 103 | static struct proc_dir_entry *ibmveth_proc_dir; |
104 | #endif | 104 | #endif |
105 | 105 | ||
@@ -1010,7 +1010,7 @@ static int __devexit ibmveth_remove(struct vio_dev *dev) | |||
1010 | #ifdef CONFIG_PROC_FS | 1010 | #ifdef CONFIG_PROC_FS |
1011 | static void ibmveth_proc_register_driver(void) | 1011 | static void ibmveth_proc_register_driver(void) |
1012 | { | 1012 | { |
1013 | ibmveth_proc_dir = create_proc_entry(IBMVETH_PROC_DIR, S_IFDIR, proc_net); | 1013 | ibmveth_proc_dir = proc_mkdir(IBMVETH_PROC_DIR, NULL); |
1014 | if (ibmveth_proc_dir) { | 1014 | if (ibmveth_proc_dir) { |
1015 | SET_MODULE_OWNER(ibmveth_proc_dir); | 1015 | SET_MODULE_OWNER(ibmveth_proc_dir); |
1016 | } | 1016 | } |
@@ -1018,7 +1018,7 @@ static void ibmveth_proc_register_driver(void) | |||
1018 | 1018 | ||
1019 | static void ibmveth_proc_unregister_driver(void) | 1019 | static void ibmveth_proc_unregister_driver(void) |
1020 | { | 1020 | { |
1021 | remove_proc_entry(IBMVETH_PROC_DIR, proc_net); | 1021 | remove_proc_entry(IBMVETH_PROC_DIR, NULL); |
1022 | } | 1022 | } |
1023 | 1023 | ||
1024 | static void *ibmveth_seq_start(struct seq_file *seq, loff_t *pos) | 1024 | static void *ibmveth_seq_start(struct seq_file *seq, loff_t *pos) |
diff --git a/drivers/net/irda/vlsi_ir.c b/drivers/net/irda/vlsi_ir.c index 6d9de626c967..651c5a6578fd 100644 --- a/drivers/net/irda/vlsi_ir.c +++ b/drivers/net/irda/vlsi_ir.c | |||
@@ -1875,11 +1875,11 @@ static int __init vlsi_mod_init(void) | |||
1875 | 1875 | ||
1876 | sirpulse = !!sirpulse; | 1876 | sirpulse = !!sirpulse; |
1877 | 1877 | ||
1878 | /* create_proc_entry returns NULL if !CONFIG_PROC_FS. | 1878 | /* proc_mkdir returns NULL if !CONFIG_PROC_FS. |
1879 | * Failure to create the procfs entry is handled like running | 1879 | * Failure to create the procfs entry is handled like running |
1880 | * without procfs - it's not required for the driver to work. | 1880 | * without procfs - it's not required for the driver to work. |
1881 | */ | 1881 | */ |
1882 | vlsi_proc_root = create_proc_entry(PROC_DIR, S_IFDIR, NULL); | 1882 | vlsi_proc_root = proc_mkdir(PROC_DIR, NULL); |
1883 | if (vlsi_proc_root) { | 1883 | if (vlsi_proc_root) { |
1884 | /* protect registered procdir against module removal. | 1884 | /* protect registered procdir against module removal. |
1885 | * Because we are in the module init path there's no race | 1885 | * Because we are in the module init path there's no race |
diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c index 82f236cc3b9b..a842ecc60a34 100644 --- a/drivers/net/pppoe.c +++ b/drivers/net/pppoe.c | |||
@@ -1070,7 +1070,7 @@ static int __init pppoe_proc_init(void) | |||
1070 | { | 1070 | { |
1071 | struct proc_dir_entry *p; | 1071 | struct proc_dir_entry *p; |
1072 | 1072 | ||
1073 | p = create_proc_entry("pppoe", S_IRUGO, proc_net); | 1073 | p = create_proc_entry("net/pppoe", S_IRUGO, NULL); |
1074 | if (!p) | 1074 | if (!p) |
1075 | return -ENOMEM; | 1075 | return -ENOMEM; |
1076 | 1076 | ||
@@ -1142,7 +1142,7 @@ static void __exit pppoe_exit(void) | |||
1142 | dev_remove_pack(&pppoes_ptype); | 1142 | dev_remove_pack(&pppoes_ptype); |
1143 | dev_remove_pack(&pppoed_ptype); | 1143 | dev_remove_pack(&pppoed_ptype); |
1144 | unregister_netdevice_notifier(&pppoe_notifier); | 1144 | unregister_netdevice_notifier(&pppoe_notifier); |
1145 | remove_proc_entry("pppoe", proc_net); | 1145 | remove_proc_entry("net/pppoe", NULL); |
1146 | proto_unregister(&pppoe_sk_proto); | 1146 | proto_unregister(&pppoe_sk_proto); |
1147 | } | 1147 | } |
1148 | 1148 | ||
diff --git a/drivers/net/sk98lin/skge.c b/drivers/net/sk98lin/skge.c index 2e72d79a143c..b18c92cb629e 100644 --- a/drivers/net/sk98lin/skge.c +++ b/drivers/net/sk98lin/skge.c | |||
@@ -235,7 +235,7 @@ static int SkDrvDeInitAdapter(SK_AC *pAC, int devNbr); | |||
235 | * Extern Function Prototypes | 235 | * Extern Function Prototypes |
236 | * | 236 | * |
237 | ******************************************************************************/ | 237 | ******************************************************************************/ |
238 | static const char SKRootName[] = "sk98lin"; | 238 | static const char SKRootName[] = "net/sk98lin"; |
239 | static struct proc_dir_entry *pSkRootDir; | 239 | static struct proc_dir_entry *pSkRootDir; |
240 | extern struct file_operations sk_proc_fops; | 240 | extern struct file_operations sk_proc_fops; |
241 | 241 | ||
@@ -5242,20 +5242,20 @@ static int __init skge_init(void) | |||
5242 | { | 5242 | { |
5243 | int error; | 5243 | int error; |
5244 | 5244 | ||
5245 | pSkRootDir = proc_mkdir(SKRootName, proc_net); | 5245 | pSkRootDir = proc_mkdir(SKRootName, NULL); |
5246 | if (pSkRootDir) | 5246 | if (pSkRootDir) |
5247 | pSkRootDir->owner = THIS_MODULE; | 5247 | pSkRootDir->owner = THIS_MODULE; |
5248 | 5248 | ||
5249 | error = pci_register_driver(&skge_driver); | 5249 | error = pci_register_driver(&skge_driver); |
5250 | if (error) | 5250 | if (error) |
5251 | proc_net_remove(SKRootName); | 5251 | remove_proc_entry(SKRootName, NULL); |
5252 | return error; | 5252 | return error; |
5253 | } | 5253 | } |
5254 | 5254 | ||
5255 | static void __exit skge_exit(void) | 5255 | static void __exit skge_exit(void) |
5256 | { | 5256 | { |
5257 | pci_unregister_driver(&skge_driver); | 5257 | pci_unregister_driver(&skge_driver); |
5258 | proc_net_remove(SKRootName); | 5258 | remove_proc_entry(SKRootName, NULL); |
5259 | 5259 | ||
5260 | } | 5260 | } |
5261 | 5261 | ||