lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ide-floppy: mv idefloppy_{should_,}report_error

Browse Source 
In addition to shortening the function name, move the printk-call into the
function thereby saving some code lines. Also, make the function out_of_line
since it is not on a performance critical path. Finally, rename the reworked
function to ide_floppy..().

Bart:
- minor CodingStyle fixup

Signed-off-by: Borislav Petkov <bbpetkov@yahoo.de>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
Borislav Petkov
2008-02-02 19:56:35 +01:00
committed by Bartlomiej Zolnierkiewicz
parent d30a7fba43
commit d652c13808
1 changed files with 14 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
drivers/ide/ide-floppy.c
View File

@@ -737,18 +737,20 @@ static ide_startstop_t idefloppy_transfer_pc1 (ide_drive_t *drive)
return ide_started; return ide_started;
} }
/** static void ide_floppy_report_error(idefloppy_floppy_t *floppy,
* idefloppy_should_report_error() idefloppy_pc_t *pc)
*
* Supresses error messages resulting from Medium not present
*/
static inline int idefloppy_should_report_error(idefloppy_floppy_t *floppy)
{ {
/* supress error messages resulting from Medium not present */
if (floppy->sense_key == 0x02 && if (floppy->sense_key == 0x02 &&
floppy->asc == 0x3a && floppy->asc == 0x3a &&
floppy->ascq == 0x00) floppy->ascq == 0x00)
return 0; return;
return 1;
printk(KERN_ERR "ide-floppy: %s: I/O error, pc = %2x, key = %2x, "
"asc = %2x, ascq = %2x\n",
floppy->drive->name, pc->c[0], floppy->sense_key,
floppy->asc, floppy->ascq);
} }
/* /*
@@ -775,15 +777,8 @@ static ide_startstop_t idefloppy_issue_pc (ide_drive_t *drive, idefloppy_pc_t *p
* a legitimate error code was received. * a legitimate error code was received.
*/ */
if (!test_bit(PC_ABORT, &pc->flags)) { if (!test_bit(PC_ABORT, &pc->flags)) {
if (!test_bit(PC_SUPPRESS_ERROR, &pc->flags)) { if (!test_bit(PC_SUPPRESS_ERROR, &pc->flags))
if (idefloppy_should_report_error(floppy)) ide_floppy_report_error(floppy, pc);
printk(KERN_ERR "ide-floppy: %s: I/O error, "
"pc = %2x, key = %2x, "
"asc = %2x, ascq = %2x\n",
drive->name, pc->c[0],
floppy->sense_key,
floppy->asc, floppy->ascq);
}
/* Giving up */ /* Giving up */
pc->error = IDEFLOPPY_ERROR_GENERAL; pc->error = IDEFLOPPY_ERROR_GENERAL;
} }
@@ -993,13 +988,8 @@ static ide_startstop_t idefloppy_do_request (ide_drive_t *drive, struct request
rq->nr_sectors, rq->current_nr_sectors); rq->nr_sectors, rq->current_nr_sectors);
if (rq->errors >= ERROR_MAX) { if (rq->errors >= ERROR_MAX) {
if (floppy->failed_pc != NULL) { if (floppy->failed_pc)
if (idefloppy_should_report_error(floppy)) ide_floppy_report_error(floppy, floppy->failed_pc);
printk(KERN_ERR "ide-floppy: %s: I/O error, pc = %2x,"
" key = %2x, asc = %2x, ascq = %2x\n",
drive->name, floppy->failed_pc->c[0],
floppy->sense_key, floppy->asc, floppy->ascq);
}
else else
printk(KERN_ERR "ide-floppy: %s: I/O error\n", printk(KERN_ERR "ide-floppy: %s: I/O error\n",
drive->name); drive->name);