diff options
| author | Richard Gooch <rgooch@atnf.csiro.au> | 2002-07-25 17:02:09 +0000 |
|---|---|---|
| committer | Richard Gooch <rgooch@atnf.csiro.au> | 2002-07-25 17:02:09 +0000 |
| commit | 5dcb5df17dff30d2905afccdedec1561e53dd7d4 (patch) | |
| tree | e23ef687f5f8e9b1d9febddf612adf33d27ccc95 /drivers/cdrom | |
| parent | fe65ee28fec8ef713a1e7e83b03a0a12d8938fe3 (diff) | |
do_mounts.c, block_dev.c, hiddev.c, md.c:
Switched from devfs_find_handle() to devfs_get_handle()
Many files:
Switched from devfs_find_handle() to devfs_find_and_unregister()
base.c:
Created <devfs_find_and_unregister>.
Diffstat (limited to 'drivers/cdrom')
| -rw-r--r-- | drivers/cdrom/aztcd.c | 3 | ||||
| -rw-r--r-- | drivers/cdrom/gscd.c | 3 | ||||
| -rw-r--r-- | drivers/cdrom/optcd.c | 3 | ||||
| -rw-r--r-- | drivers/cdrom/sjcd.c | 3 | ||||
| -rw-r--r-- | drivers/cdrom/sonycd535.c | 4 |
5 files changed, 6 insertions, 10 deletions
diff --git a/drivers/cdrom/aztcd.c b/drivers/cdrom/aztcd.c index 22ca16434100..5f8449ce1c6b 100644 --- a/drivers/cdrom/aztcd.c +++ b/drivers/cdrom/aztcd.c @@ -1957,8 +1957,7 @@ int __init aztcd_init(void) void __exit aztcd_exit(void) { - devfs_unregister(devfs_find_handle - (NULL, "aztcd", 0, 0, DEVFS_SPECIAL_BLK, 0)); + devfs_find_and_unregister(NULL, "aztcd", 0, 0, DEVFS_SPECIAL_BLK, 0); if ((devfs_unregister_blkdev(MAJOR_NR, "aztcd") == -EINVAL)) { printk("What's that: can't unregister aztcd\n"); return; diff --git a/drivers/cdrom/gscd.c b/drivers/cdrom/gscd.c index dcca0b08c176..90f510585cb4 100644 --- a/drivers/cdrom/gscd.c +++ b/drivers/cdrom/gscd.c @@ -933,8 +933,7 @@ void __exit exit_gscd(void) { CLEAR_TIMER; - devfs_unregister(devfs_find_handle - (NULL, "gscd", 0, 0, DEVFS_SPECIAL_BLK, 0)); + devfs_find_and_unregister(NULL, "gscd", 0, 0, DEVFS_SPECIAL_BLK, 0); if ((devfs_unregister_blkdev(MAJOR_NR, "gscd") == -EINVAL)) { printk("What's that: can't unregister GoldStar-module\n"); return; diff --git a/drivers/cdrom/optcd.c b/drivers/cdrom/optcd.c index f04e6e276ea7..b8a6aa0e991a 100644 --- a/drivers/cdrom/optcd.c +++ b/drivers/cdrom/optcd.c @@ -2051,8 +2051,7 @@ int __init optcd_init(void) void __exit optcd_exit(void) { - devfs_unregister(devfs_find_handle(NULL, "optcd", 0, 0, - DEVFS_SPECIAL_BLK, 0)); + devfs_find_and_unregister(NULL, "optcd", 0, 0, DEVFS_SPECIAL_BLK, 0); if (devfs_unregister_blkdev(MAJOR_NR, "optcd") == -EINVAL) { printk(KERN_ERR "optcd: what's that: can't unregister\n"); return; diff --git a/drivers/cdrom/sjcd.c b/drivers/cdrom/sjcd.c index 544af743969b..0619f9f58ceb 100644 --- a/drivers/cdrom/sjcd.c +++ b/drivers/cdrom/sjcd.c @@ -1802,8 +1802,7 @@ static int sjcd_cleanup(void) void __exit sjcd_exit(void) { - devfs_unregister(devfs_find_handle - (NULL, "sjcd", 0, 0, DEVFS_SPECIAL_BLK, 0)); + devfs_find_and_unregister(NULL, "sjcd", 0, 0, DEVFS_SPECIAL_BLK, 0); if (sjcd_cleanup()) printk("SJCD: module: cannot be removed.\n"); else diff --git a/drivers/cdrom/sonycd535.c b/drivers/cdrom/sonycd535.c index de22c78ab862..46865fc9a162 100644 --- a/drivers/cdrom/sonycd535.c +++ b/drivers/cdrom/sonycd535.c @@ -1700,8 +1700,8 @@ sony535_exit(void) kfree(sony_buffer); kfree(last_sony_subcode); kfree(sony_toc); - devfs_unregister(devfs_find_handle(NULL, CDU535_HANDLE, 0, 0, - DEVFS_SPECIAL_BLK, 0)); + devfs_find_and_unregister(NULL, CDU535_HANDLE, 0, 0, + DEVFS_SPECIAL_BLK, 0); if (devfs_unregister_blkdev(MAJOR_NR, CDU535_HANDLE) == -EINVAL) printk("Uh oh, couldn't unregister " CDU535_HANDLE "\n"); else |