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

ide: add ide_read_ireason() helper

Browse Source 
Add ide_read_ireason() helper and use instead of ->INB for reading
ATAPI Interrupt Reason register.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
Bartlomiej Zolnierkiewicz
2008-07-23 19:55:54 +02:00
parent 1f2efb82af
commit 88a72109b2
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/ide/ide-atapi.c
View File

@@ -183,16 +183,27 @@ cmd_finished:
} }
EXPORT_SYMBOL_GPL(ide_pc_intr); EXPORT_SYMBOL_GPL(ide_pc_intr);
static u8 ide_read_ireason(ide_drive_t *drive)
{
ide_task_t task;
memset(&task, 0, sizeof(task));
task.tf_flags = IDE_TFLAG_IN_NSECT;
drive->hwif->tf_read(drive, &task);
return task.tf.nsect & 3;
}
static u8 ide_wait_ireason(ide_drive_t *drive, u8 ireason) static u8 ide_wait_ireason(ide_drive_t *drive, u8 ireason)
{ {
ide_hwif_t *hwif = drive->hwif;
int retries = 100; int retries = 100;
while (retries-- && ((ireason & CD) == 0 || (ireason & IO))) { while (retries-- && ((ireason & CD) == 0 || (ireason & IO))) {
printk(KERN_ERR "%s: (IO,CoD != (0,1) while issuing " printk(KERN_ERR "%s: (IO,CoD != (0,1) while issuing "
"a packet command, retrying\n", drive->name); "a packet command, retrying\n", drive->name);
udelay(100); udelay(100);
ireason = hwif->INB(hwif->io_ports.nsect_addr); ireason = ide_read_ireason(drive);
if (retries == 0) { if (retries == 0) {
printk(KERN_ERR "%s: (IO,CoD != (0,1) while issuing " printk(KERN_ERR "%s: (IO,CoD != (0,1) while issuing "
"a packet command, ignoring\n", "a packet command, ignoring\n",
@@ -219,7 +230,7 @@ ide_startstop_t ide_transfer_pc(ide_drive_t *drive, struct ide_atapi_pc *pc,
return startstop; return startstop;
} }
ireason = hwif->INB(hwif->io_ports.nsect_addr); ireason = ide_read_ireason(drive);
if (drive->media == ide_tape && !drive->scsi) if (drive->media == ide_tape && !drive->scsi)
ireason = ide_wait_ireason(drive, ireason); ireason = ide_wait_ireason(drive, ireason);