aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-atapi.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-07-23 13:55:54 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-07-23 13:55:54 -0400
commit1823649b5abb77ffe638178bc5253249d3ecd17d (patch)
tree154d876b89cf010568d18105913c7fbca8d7cba9 /drivers/ide/ide-atapi.c
parent88a72109b2256bf2974f324a8f890b4a06faf7e9 (diff)
ide: add ide_read_bcount_and_ireason() helper
Add ide_read_bcount_and_ireason() helper and use it instead of ->INB in {cdrom_newpc,ide_pc}_intr(). Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-atapi.c')
-rw-r--r--drivers/ide/ide-atapi.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c
index bfab5c4afc6a..f17a00ccbe96 100644
--- a/drivers/ide/ide-atapi.c
+++ b/drivers/ide/ide-atapi.c
@@ -107,11 +107,9 @@ cmd_finished:
107 ide_dma_off(drive); 107 ide_dma_off(drive);
108 return ide_do_reset(drive); 108 return ide_do_reset(drive);
109 } 109 }
110 /* Get the number of bytes to transfer on this interrupt. */
111 bcount = (hwif->INB(hwif->io_ports.lbah_addr) << 8) |
112 hwif->INB(hwif->io_ports.lbam_addr);
113 110
114 ireason = hwif->INB(hwif->io_ports.nsect_addr); 111 /* Get the number of bytes to transfer on this interrupt. */
112 ide_read_bcount_and_ireason(drive, &bcount, &ireason);
115 113
116 if (ireason & CD) { 114 if (ireason & CD) {
117 printk(KERN_ERR "%s: CoD != 0 in %s\n", drive->name, __func__); 115 printk(KERN_ERR "%s: CoD != 0 in %s\n", drive->name, __func__);