summaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-cd.c
diff options
context:
space:
mode:
authorAkinobu Mita2008-03-26 12:09:02 +0100
committerJens Axboe2008-04-21 09:50:08 +0200
commit0a0c4114df4a6903bccb65b06cabb6ddc968f877 (patch)
treebec7598da3593bc32019fb1f1ed4617769e108e7 /drivers/ide/ide-cd.c
parentcdrom: use list_head for cdrom_device_info list (diff)
downloadkernel-qcow2-linux-0a0c4114df4a6903bccb65b06cabb6ddc968f877.tar.gz
kernel-qcow2-linux-0a0c4114df4a6903bccb65b06cabb6ddc968f877.tar.xz
kernel-qcow2-linux-0a0c4114df4a6903bccb65b06cabb6ddc968f877.zip
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/ide-cd.c')
-rw-r--r--drivers/ide/ide-cd.c5
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)
kfree(info->buffer);
kfree(info->toc);
- if (devinfo->handle == drive && unregister_cdrom(devinfo))
- printk(KERN_ERR "%s: %s failed to unregister device from the cdrom "
- "driver.\n", __FUNCTION__, drive->name);
+ if (devinfo->handle == drive)
+ unregister_cdrom(devinfo);
drive->dsc_overlap = 0;
drive->driver_data = NULL;
blk_queue_prep_rq(drive->queue, NULL);