Commit d9841db4 authored by Alexander Viro's avatar Alexander Viro Committed by Linus Torvalds

[PATCH] ppp cleanup

	switched to devfs_remove(), killed gratitious devfs_handle_t variable.
parent 35e65b61
...@@ -776,8 +776,6 @@ static struct file_operations ppp_device_fops = { ...@@ -776,8 +776,6 @@ static struct file_operations ppp_device_fops = {
#define PPP_MAJOR 108 #define PPP_MAJOR 108
static devfs_handle_t devfs_handle;
/* Called at boot time if ppp is compiled into the kernel, /* Called at boot time if ppp is compiled into the kernel,
or at module load time (from init_module) if compiled as a module. */ or at module load time (from init_module) if compiled as a module. */
int __init ppp_init(void) int __init ppp_init(void)
...@@ -788,11 +786,8 @@ int __init ppp_init(void) ...@@ -788,11 +786,8 @@ int __init ppp_init(void)
err = register_chrdev(PPP_MAJOR, "ppp", &ppp_device_fops); err = register_chrdev(PPP_MAJOR, "ppp", &ppp_device_fops);
if (err) if (err)
printk(KERN_ERR "failed to register PPP device (%d)\n", err); printk(KERN_ERR "failed to register PPP device (%d)\n", err);
devfs_handle = devfs_register(NULL, "ppp", DEVFS_FL_DEFAULT, devfs_register(NULL, "ppp", DEVFS_FL_DEFAULT, PPP_MAJOR, 0,
PPP_MAJOR, 0, S_IFCHR | S_IRUSR | S_IWUSR, &ppp_device_fops, NULL);
S_IFCHR | S_IRUSR | S_IWUSR,
&ppp_device_fops, NULL);
return 0; return 0;
} }
...@@ -2511,7 +2506,7 @@ static void __exit ppp_cleanup(void) ...@@ -2511,7 +2506,7 @@ static void __exit ppp_cleanup(void)
cardmap_destroy(&all_ppp_units); cardmap_destroy(&all_ppp_units);
if (unregister_chrdev(PPP_MAJOR, "ppp") != 0) if (unregister_chrdev(PPP_MAJOR, "ppp") != 0)
printk(KERN_ERR "PPP: failed to unregister PPP device\n"); printk(KERN_ERR "PPP: failed to unregister PPP device\n");
devfs_unregister(devfs_handle); devfs_remove("ppp");
} }
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment