ide-cd: remove needless ide_dump_status_no_sense() wrapper

It makes no sense to check for BSY bit being set as earlier OK_STAT()
check in cdrom_end_request() makes sure that BSY bit is cleared.

There should be no functional changes caused by this patch.

Cc: Borislav Petkov <petkovbb@gmail.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 13eae6a4
...@@ -290,13 +290,6 @@ static void cdrom_end_request(ide_drive_t *drive, int uptodate) ...@@ -290,13 +290,6 @@ static void cdrom_end_request(ide_drive_t *drive, int uptodate)
ide_complete_rq(drive, uptodate ? 0 : -EIO, nsectors << 9); ide_complete_rq(drive, uptodate ? 0 : -EIO, nsectors << 9);
} }
static void ide_dump_status_no_sense(ide_drive_t *drive, const char *msg, u8 st)
{
if (st & 0x80)
return;
ide_dump_status(drive, msg, st);
}
/* /*
* Returns: * Returns:
* 0: if the request should be continued. * 0: if the request should be continued.
...@@ -439,21 +432,19 @@ static int cdrom_decode_status(ide_drive_t *drive, int good_stat, int *stat_ret) ...@@ -439,21 +432,19 @@ static int cdrom_decode_status(ide_drive_t *drive, int good_stat, int *stat_ret)
* No point in retrying after an illegal request or data * No point in retrying after an illegal request or data
* protect error. * protect error.
*/ */
ide_dump_status_no_sense(drive, "command error", stat); ide_dump_status(drive, "command error", stat);
do_end_request = 1; do_end_request = 1;
} else if (sense_key == MEDIUM_ERROR) { } else if (sense_key == MEDIUM_ERROR) {
/* /*
* No point in re-trying a zillion times on a bad * No point in re-trying a zillion times on a bad
* sector. If we got here the error is not correctable. * sector. If we got here the error is not correctable.
*/ */
ide_dump_status_no_sense(drive, ide_dump_status(drive, "media error (bad sector)",
"media error (bad sector)", stat);
stat);
do_end_request = 1; do_end_request = 1;
} else if (sense_key == BLANK_CHECK) { } else if (sense_key == BLANK_CHECK) {
/* disk appears blank ?? */ /* disk appears blank ?? */
ide_dump_status_no_sense(drive, "media error (blank)", ide_dump_status(drive, "media error (blank)", stat);
stat);
do_end_request = 1; do_end_request = 1;
} else if ((err & ~ATA_ABORTED) != 0) { } else if ((err & ~ATA_ABORTED) != 0) {
/* go to the default handler for other errors */ /* go to the default handler for other errors */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment