xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cdrom: make unregister_cdrom() return void

Browse Source 
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>
This commit is contained in:
Akinobu Mita
2008-03-26 12:09:02 +01:00
committed by Jens Axboe
parent 7fd097d42b
commit 0a0c4114df
6 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/cdrom/cdrom.c
View File

@@ -442,7 +442,7 @@ int register_cdrom(struct cdrom_device_info *cdi)
}
#undef ENSURE
int unregister_cdrom(struct cdrom_device_info *cdi)
void unregister_cdrom(struct cdrom_device_info *cdi)
{
cdinfo(CD_OPEN, "entering unregister_cdrom\n");
@@ -455,7 +455,6 @@ int unregister_cdrom(struct cdrom_device_info *cdi)
cdi->ops->n_minors--;
cdinfo(CD_REG_UNREG, "drive \"/dev/%s\" unregistered\n", cdi->name);
return 0;
}
int cdrom_get_media_event(struct cdrom_device_info *cdi,

4
drivers/cdrom/gdrom.c
View File

@@ -827,7 +827,9 @@ static int __devexit remove_gdrom(struct platform_device *devptr)
del_gendisk(gd.disk);
if (gdrom_major)
unregister_blkdev(gdrom_major, GDROM_DEV_NAME);
return unregister_cdrom(gd.cd_info);
unregister_cdrom(gd.cd_info);
return 0;
}
static struct platform_driver gdrom_driver = {

5
drivers/cdrom/viocd.c
View File

@@ -650,10 +650,7 @@ static int viocd_remove(struct vio_dev *vdev)
{
struct disk_info *d = &viocd_diskinfo[vdev->unit_address];
if (unregister_cdrom(&d->viocd_info) != 0)
printk(VIOCD_KERN_WARNING
"Cannot unregister viocd CD-ROM %s!\n",
d->viocd_info.name);
unregister_cdrom(&d->viocd_info);
del_gendisk(d->viocd_disk);
blk_cleanup_queue(d->viocd_disk->queue);
put_disk(d->viocd_disk);