Commit 64a57fe4 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: add ide_read_error() inline helper 



Acked-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent c47137a9

drivers/ide/ide-cd.c

+1 −1
Original line number Diff line number Diff line
@@ -304,7 +304,7 @@ static int cdrom_decode_status(ide_drive_t *drive, int good_stat, int *stat_ret) 
		return 0;



	/* Get the IDE error register. */

	err = HWIF(drive)->INB(IDE_ERROR_REG);

	err = ide_read_error(drive);

	sense_key = err >> 4;



	if (rq == NULL) {

drivers/ide/ide-floppy.c

+1 −1
Original line number Diff line number Diff line
@@ -465,7 +465,7 @@ static void idefloppy_retry_pc(ide_drive_t *drive) 
	idefloppy_pc_t *pc;

	struct request *rq;



	(void)drive->hwif->INB(IDE_ERROR_REG);

	(void)ide_read_error(drive);

	pc = idefloppy_next_pc_storage(drive);

	rq = idefloppy_next_rq_storage(drive);

	idefloppy_create_request_sense_cmd(pc);

drivers/ide/ide-io.c

+2 −2
Original line number Diff line number Diff line
@@ -821,8 +821,8 @@ static ide_startstop_t execute_drive_cmd (ide_drive_t *drive, 
#ifdef DEBUG

 	printk("%s: DRIVE_CMD (null)\n", drive->name);

#endif

	ide_end_drive_cmd(drive, ide_read_status(drive),

			hwif->INB(IDE_ERROR_REG));

	ide_end_drive_cmd(drive, ide_read_status(drive), ide_read_error(drive));



 	return ide_stopped;

}

drivers/ide/ide-iops.c

+3 −1
Original line number Diff line number Diff line
@@ -918,7 +918,9 @@ static ide_startstop_t reset_pollfunc (ide_drive_t *drive) 
		drive->failures++;

	} else  {

		printk("%s: reset: ", hwif->name);

		if ((tmp = hwif->INB(IDE_ERROR_REG)) == 1) {

		tmp = ide_read_error(drive);



		if (tmp == 1) {

			printk("success\n");

			drive->failures = 0;

		} else {

drivers/ide/ide-lib.c

+1 −1
Original line number Diff line number Diff line
@@ -578,7 +578,7 @@ u8 ide_dump_status(ide_drive_t *drive, const char *msg, u8 stat) 
	}

	printk("}\n");

	if ((stat & (BUSY_STAT|ERR_STAT)) == ERR_STAT) {

		err = drive->hwif->INB(IDE_ERROR_REG);

		err = ide_read_error(drive);

		printk("%s: %s: error=0x%02x ", drive->name, msg, err);

		if (drive->media == ide_disk)

			ide_dump_ata_error(drive, err);