diff options
author | Akinobu Mita <akinobu.mita@gmail.com> | 2008-03-26 07:09:02 -0400 |
---|---|---|
committer | Jens Axboe <jens.axboe@oracle.com> | 2008-04-21 03:50:08 -0400 |
commit | 0a0c4114df4a6903bccb65b06cabb6ddc968f877 (patch) | |
tree | bec7598da3593bc32019fb1f1ed4617769e108e7 /drivers/ide | |
parent | 7fd097d42b90afadae4867db5d580bcd7b3b596d (diff) |
cdrom: make unregister_cdrom() return void
Now unregister_cdrom() always returns 0.
Make it return void and update all callers that check the return value.
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Cc: Adrian McMenamin <adrian@mcmen.demon.co.uk>
Cc: Borislav Petkov <petkovbb@gmail.com>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'drivers/ide')
-rw-r--r-- | drivers/ide/ide-cd.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c index 396000208f81..fe5aefbf8339 100644 --- a/drivers/ide/ide-cd.c +++ b/drivers/ide/ide-cd.c | |||
@@ -2032,9 +2032,8 @@ static void ide_cd_release(struct kref *kref) | |||
2032 | 2032 | ||
2033 | kfree(info->buffer); | 2033 | kfree(info->buffer); |
2034 | kfree(info->toc); | 2034 | kfree(info->toc); |
2035 | if (devinfo->handle == drive && unregister_cdrom(devinfo)) | 2035 | if (devinfo->handle == drive) |
2036 | printk(KERN_ERR "%s: %s failed to unregister device from the cdrom " | 2036 | unregister_cdrom(devinfo); |
2037 | "driver.\n", __FUNCTION__, drive->name); | ||
2038 | drive->dsc_overlap = 0; | 2037 | drive->dsc_overlap = 0; |
2039 | drive->driver_data = NULL; | 2038 | drive->driver_data = NULL; |
2040 | blk_queue_prep_rq(drive->queue, NULL); | 2039 | blk_queue_prep_rq(drive->queue, NULL); |