diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-02-05 20:57:51 -0500 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-02-05 20:57:51 -0500 |
commit | c47137a99c597330b69057158b26061a360c0e09 (patch) | |
tree | aacd4cb968b8d7bdebdcbcce19f110469a977243 /drivers/scsi | |
parent | 29dd59755a849cc6475faa6a75f3b804e23a6fc2 (diff) |
ide: add ide_read_[alt]status() inline helpers
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/scsi')
-rw-r--r-- | drivers/scsi/ide-scsi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/ide-scsi.c b/drivers/scsi/ide-scsi.c index 6c4f0f081785..68e5c632c5d5 100644 --- a/drivers/scsi/ide-scsi.c +++ b/drivers/scsi/ide-scsi.c | |||
@@ -287,7 +287,7 @@ static int idescsi_end_request(ide_drive_t *, int, int); | |||
287 | static ide_startstop_t | 287 | static ide_startstop_t |
288 | idescsi_atapi_error(ide_drive_t *drive, struct request *rq, u8 stat, u8 err) | 288 | idescsi_atapi_error(ide_drive_t *drive, struct request *rq, u8 stat, u8 err) |
289 | { | 289 | { |
290 | if (HWIF(drive)->INB(IDE_STATUS_REG) & (BUSY_STAT|DRQ_STAT)) | 290 | if (ide_read_status(drive) & (BUSY_STAT | DRQ_STAT)) |
291 | /* force an abort */ | 291 | /* force an abort */ |
292 | HWIF(drive)->OUTB(WIN_IDLEIMMEDIATE,IDE_COMMAND_REG); | 292 | HWIF(drive)->OUTB(WIN_IDLEIMMEDIATE,IDE_COMMAND_REG); |
293 | 293 | ||
@@ -423,7 +423,7 @@ static ide_startstop_t idescsi_pc_intr (ide_drive_t *drive) | |||
423 | } | 423 | } |
424 | 424 | ||
425 | /* Clear the interrupt */ | 425 | /* Clear the interrupt */ |
426 | stat = drive->hwif->INB(IDE_STATUS_REG); | 426 | stat = ide_read_status(drive); |
427 | 427 | ||
428 | if ((stat & DRQ_STAT) == 0) { | 428 | if ((stat & DRQ_STAT) == 0) { |
429 | /* No more interrupts */ | 429 | /* No more interrupts */ |