[PATCH] drivers/cdrom/cdrom.c: simplify logic in cdrom_release()
---
From: Borislav Petkov <[EMAIL PROTECTED]>
Simplify logic in cdrom_release() without semantical change.
Signed-off-by: Borislav Petkov <[EMAIL PROTECTED]>
--
drivers/cdrom/cdrom.c | 17 +
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
index af05610..037d4ec 100644
--- a/drivers/cdrom/cdrom.c
+++ b/drivers/cdrom/cdrom.c
@@ -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);
--
Regards/Gruß,
Boris.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[PATCH] drivers/cdrom/cdrom.c: simplify logic in cdrom_release()
---
From: Borislav Petkov [EMAIL PROTECTED]
Simplify logic in cdrom_release() without semantical change.
Signed-off-by: Borislav Petkov [EMAIL PROTECTED]
--
drivers/cdrom/cdrom.c | 17 +
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
index af05610..037d4ec 100644
--- a/drivers/cdrom/cdrom.c
+++ b/drivers/cdrom/cdrom.c
@@ -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);
--
Regards/Gruß,
Boris.
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
