Commit c47137a9 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: add ide_read_[alt]status() inline helpers 



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

drivers/ide/arm/icside.c

+1 −1
Original line number Diff line number Diff line
@@ -365,7 +365,7 @@ static void icside_dma_timeout(ide_drive_t *drive) 
	if (icside_dma_test_irq(drive))

		return;



	ide_dump_status(drive, "DMA timeout", HWIF(drive)->INB(IDE_STATUS_REG));

	ide_dump_status(drive, "DMA timeout", ide_read_status(drive));



	icside_dma_end(drive);

}

drivers/ide/ide-cd.c

+4 −3
Original line number Diff line number Diff line
@@ -295,7 +295,8 @@ static int cdrom_decode_status(ide_drive_t *drive, int good_stat, int *stat_ret) 
	int stat, err, sense_key;

	

	/* Check for errors. */

	stat = HWIF(drive)->INB(IDE_STATUS_REG);

	stat = ide_read_status(drive);



	if (stat_ret)

		*stat_ret = stat;
@@ -692,7 +693,7 @@ int ide_cd_check_ireason(ide_drive_t *drive, int len, int ireason, int rw) 
		/* Some drives (ASUS) seem to tell us that status

		 * info is available. just get it and ignore.

		 */

		(void) HWIF(drive)->INB(IDE_STATUS_REG);

		(void)ide_read_status(drive);

		return 0;

	} else {

		/* Drive wants a command packet, or invalid ireason... */
@@ -1326,7 +1327,7 @@ ide_do_rw_cdrom (ide_drive_t *drive, struct request *rq, sector_t block) 
	if (blk_fs_request(rq)) {

		if (info->cd_flags & IDE_CD_FLAG_SEEKING) {

			unsigned long elapsed = jiffies - info->start_seek;

			int stat = HWIF(drive)->INB(IDE_STATUS_REG);

			int stat = ide_read_status(drive);



			if ((stat & SEEK_STAT) != SEEK_STAT) {

				if (elapsed < IDECD_SEEK_TIMEOUT) {

drivers/ide/ide-dma.c

+2 −1
Original line number Diff line number Diff line
@@ -147,7 +147,8 @@ ide_startstop_t ide_dma_intr (ide_drive_t *drive) 
	u8 stat = 0, dma_stat = 0;



	dma_stat = HWIF(drive)->ide_dma_end(drive);

	stat = HWIF(drive)->INB(IDE_STATUS_REG);	/* get drive status */

	stat = ide_read_status(drive);



	if (OK_STAT(stat,DRIVE_READY,drive->bad_wstat|DRQ_STAT)) {

		if (!dma_stat) {

			struct request *rq = HWGROUP(drive)->rq;

drivers/ide/ide-floppy.c

+2 −2
Original line number Diff line number Diff line
@@ -501,7 +501,7 @@ static ide_startstop_t idefloppy_pc_intr (ide_drive_t *drive) 
	}



	/* Clear the interrupt */

	stat = drive->hwif->INB(IDE_STATUS_REG);

	stat = ide_read_status(drive);



	/* No more interrupts */

	if ((stat & DRQ_STAT) == 0) {
@@ -1246,7 +1246,7 @@ static int idefloppy_get_format_progress(ide_drive_t *drive, int __user *arg) 
		u8 stat;



		local_irq_save(flags);

		stat = drive->hwif->INB(IDE_STATUS_REG);

		stat = ide_read_status(drive);

		local_irq_restore(flags);



		progress_indication = ((stat & SEEK_STAT) == 0) ? 0 : 0x10000;

drivers/ide/ide-io.c

+6 −6
Original line number Diff line number Diff line
@@ -466,7 +466,7 @@ static ide_startstop_t ide_ata_error(ide_drive_t *drive, struct request *rq, u8 
		return ide_stopped;

	}



	if (hwif->INB(IDE_STATUS_REG) & (BUSY_STAT|DRQ_STAT))

	if (ide_read_status(drive) & (BUSY_STAT | DRQ_STAT))

		rq->errors |= ERROR_RESET;



	if ((rq->errors & ERROR_RESET) == ERROR_RESET) {
@@ -493,7 +493,7 @@ static ide_startstop_t ide_atapi_error(ide_drive_t *drive, struct request *rq, u 
		/* add decoding error stuff */

	}



	if (hwif->INB(IDE_STATUS_REG) & (BUSY_STAT|DRQ_STAT))

	if (ide_read_status(drive) & (BUSY_STAT | DRQ_STAT))

		/* force an abort */

		hwif->OUTB(WIN_IDLEIMMEDIATE, IDE_COMMAND_REG);
@@ -821,8 +821,7 @@ 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,

			hwif->INB(IDE_STATUS_REG),

	ide_end_drive_cmd(drive, ide_read_status(drive),

			hwif->INB(IDE_ERROR_REG));

 	return ide_stopped;

}
@@ -1231,7 +1230,7 @@ static ide_startstop_t ide_dma_timeout_retry(ide_drive_t *drive, int error) 
		printk(KERN_WARNING "%s: DMA timeout error\n", drive->name);

		(void)HWIF(drive)->ide_dma_end(drive);

		ret = ide_error(drive, "dma timeout error",

						hwif->INB(IDE_STATUS_REG));

				ide_read_status(drive));

	} else {

		printk(KERN_WARNING "%s: DMA timeout retry\n", drive->name);

		hwif->dma_timeout(drive);
@@ -1355,7 +1354,8 @@ void ide_timer_expiry (unsigned long data) 
					startstop = ide_dma_timeout_retry(drive, wait);

				} else

					startstop =

					ide_error(drive, "irq timeout", hwif->INB(IDE_STATUS_REG));

					ide_error(drive, "irq timeout",

						  ide_read_status(drive));

			}

			drive->service_time = jiffies - drive->service_start;

			spin_lock_irq(&ide_lock);