drivers/cdrom/cdrom.c: simplify logic in cdrom_release()
Simplify logic in cdrom_release() without semantic change. Signed-off-by: Borislav Petkov <bbpetkov@yahoo.de> Cc: Jens Axboe <jens.axboe@oracle.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
18a2354db7
commit
35841f7080
|
@ -1206,25 +1206,26 @@ int check_for_audio_disc(struct cdrom_device_info * cdi,
|
|||
return 0;
|
||||
}
|
||||
|
||||
/* Admittedly, the logic below could be performed in a nicer way. */
|
||||
int cdrom_release(struct cdrom_device_info *cdi, struct file *fp)
|
||||
{
|
||||
struct cdrom_device_ops *cdo = cdi->ops;
|
||||
int opened_for_data;
|
||||
|
||||
cdinfo(CD_CLOSE, "entering cdrom_release\n");
|
||||
cdinfo(CD_CLOSE, "entering cdrom_release\n");
|
||||
|
||||
if (cdi->use_count > 0)
|
||||
cdi->use_count--;
|
||||
if (cdi->use_count == 0)
|
||||
|
||||
if (cdi->use_count == 0) {
|
||||
cdinfo(CD_CLOSE, "Use count for \"/dev/%s\" now zero\n", cdi->name);
|
||||
if (cdi->use_count == 0)
|
||||
cdrom_dvd_rw_close_write(cdi);
|
||||
if (cdi->use_count == 0 &&
|
||||
(cdo->capability & CDC_LOCK) && !keeplocked) {
|
||||
cdinfo(CD_CLOSE, "Unlocking door!\n");
|
||||
cdo->lock_door(cdi, 0);
|
||||
|
||||
if ((cdo->capability & CDC_LOCK) && !keeplocked) {
|
||||
cdinfo(CD_CLOSE, "Unlocking door!\n");
|
||||
cdo->lock_door(cdi, 0);
|
||||
}
|
||||
}
|
||||
|
||||
opened_for_data = !(cdi->options & CDO_USE_FFLAGS) ||
|
||||
!(fp && fp->f_flags & O_NONBLOCK);
|
||||
|
||||
|
|
Loading…
Reference in New Issue