diff options
| author | Bartlomiej Zolnierkiewicz | 2008-07-23 19:55:52 +0200 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz | 2008-07-23 19:55:52 +0200 |
| commit | b73c7ee25da6133f97f47ffd3557288417da7c76 (patch) | |
| tree | 0d348c81294d246b8417aff6e24502c93b312505 /drivers/ide/pci/ns87415.c | |
| parent | ide: add ->exec_command method (diff) | |
| download | kernel-qcow2-linux-b73c7ee25da6133f97f47ffd3557288417da7c76.tar.gz kernel-qcow2-linux-b73c7ee25da6133f97f47ffd3557288417da7c76.tar.xz kernel-qcow2-linux-b73c7ee25da6133f97f47ffd3557288417da7c76.zip | |
ide: add ->read_status method
* Remove ide_read_status() inline helper.
* Add ->read_status method for reading ATA Status register
and use it instead of ->INB.
While at it:
* Don't use HWGROUP() macro.
There should be no functional changes caused by this patch.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/pci/ns87415.c')
| -rw-r--r-- | drivers/ide/pci/ns87415.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/ide/pci/ns87415.c b/drivers/ide/pci/ns87415.c index 76ce112fd857..b20e5f01ac89 100644 --- a/drivers/ide/pci/ns87415.c +++ b/drivers/ide/pci/ns87415.c @@ -63,6 +63,11 @@ static u8 superio_ide_inb (unsigned long port) return inb(port); } +static u8 superio_read_status(ide_hwif_t *hwif) +{ + return superio_ide_inb(hwif->io_ports.status_addr); +} + static u8 superio_read_sff_dma_status(ide_hwif_t *hwif) { return superio_ide_inb(hwif->dma_base + ATA_DMA_STATUS); @@ -127,6 +132,7 @@ static void __devinit superio_ide_init_iops (struct hwif_s *hwif) tmp = superio_ide_inb(superio_ide_dma_status[port]); outb(tmp | 0x66, superio_ide_dma_status[port]); + hwif->read_status = superio_read_status; hwif->read_sff_dma_status = superio_read_sff_dma_status; hwif->tf_read = superio_tf_read; @@ -283,7 +289,7 @@ static void __devinit init_hwif_ns87415 (ide_hwif_t *hwif) outb(8, hwif->io_ports.ctl_addr); do { udelay(50); - stat = hwif->INB(hwif->io_ports.status_addr); + stat = hwif->read_status(hwif); if (stat == 0xff) break; } while ((stat & BUSY_STAT) && --timeout); |