Commit 0a0c4114 authored by Akinobu Mita's avatar Akinobu Mita Committed by Jens Axboe
Browse files

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: default avatarAkinobu Mita <akinobu.mita@gmail.com>
Cc: Adrian McMenamin <adrian@mcmen.demon.co.uk>
Cc: Borislav Petkov <petkovbb@gmail.com>
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent 7fd097d4

Documentation/cdrom/cdrom-standard.tex

+1 −1
Original line number Diff line number Diff line
@@ -777,7 +777,7 @@ Note that a driver must have one static structure, $<device>_dops$, while 
it may have as many structures $<device>_info$ as there are minor devices

active. $Register_cdrom()$ builds a linked list from these. 



\subsection{$Int\ unregister_cdrom(struct\ cdrom_device_info * cdi)$}

\subsection{$Void\ unregister_cdrom(struct\ cdrom_device_info * cdi)$}



Unregistering device $cdi$ with minor number $MINOR(cdi\to dev)$ removes

the minor device from the list. If it was the last registered minor for

drivers/cdrom/cdrom.c

+1 −2
Original line number Diff line number Diff line
@@ -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,

drivers/cdrom/gdrom.c

+3 −1
Original line number Diff line number Diff line
@@ -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 = {

drivers/cdrom/viocd.c

+1 −4
Original line number Diff line number Diff line
@@ -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);

drivers/ide/ide-cd.c

+2 −3
Original line number Diff line number Diff line
@@ -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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE