summaryrefslogtreecommitdiff
path: root/drivers/cdrom/optcd.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <greg@kroah.com>2002-07-30 01:40:49 -0700
committerGreg Kroah-Hartman <greg@kroah.com>2002-07-30 01:40:49 -0700
commit05535aec54eeb687feedbc5507bd502932724be5 (patch)
treebacf72bf23191ff45b764ecdc35bcfba20d1130d /drivers/cdrom/optcd.c
parentf73c159be526819727be4a43d72356c3e7caee28 (diff)
Removed devfs_register_blkdev and devfs_unregister_blkdev.
Use register_blkdev and unregister_blkdev as before, and everything will work just fine.
Diffstat (limited to 'drivers/cdrom/optcd.c')
-rw-r--r--drivers/cdrom/optcd.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/cdrom/optcd.c b/drivers/cdrom/optcd.c
index b8a6aa0e991a..cb5a01220b25 100644
--- a/drivers/cdrom/optcd.c
+++ b/drivers/cdrom/optcd.c
@@ -2031,8 +2031,7 @@ int __init optcd_init(void)
DEBUG((DEBUG_VFS, "exec_cmd COMINITDOUBLE: %02x", -status));
return -EIO;
}
- if (devfs_register_blkdev(MAJOR_NR, "optcd", &opt_fops) != 0)
- {
+ if (register_blkdev(MAJOR_NR, "optcd", &opt_fops) != 0) {
printk(KERN_ERR "optcd: unable to get major %d\n", MAJOR_NR);
release_region(optcd_port, 4);
return -EIO;
@@ -2052,7 +2051,7 @@ int __init optcd_init(void)
void __exit optcd_exit(void)
{
devfs_find_and_unregister(NULL, "optcd", 0, 0, DEVFS_SPECIAL_BLK, 0);
- if (devfs_unregister_blkdev(MAJOR_NR, "optcd") == -EINVAL) {
+ if (unregister_blkdev(MAJOR_NR, "optcd") == -EINVAL) {
printk(KERN_ERR "optcd: what's that: can't unregister\n");
return;
}