diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-02-16 20:40:25 -0500 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-02-16 20:40:25 -0500 |
commit | 0ecdca26e556eae9668ce6de9554757dddb942ef (patch) | |
tree | 21d62c01d0c0d5aeea2524252ed8dec6ca20b6d4 /drivers/ide/pci/cy82c693.c | |
parent | 7569e8dc2213ecc47024ea5edbadc8736487d926 (diff) |
ide: use PIO/MMIO operations directly where possible (v2)
This results in smaller/faster/simpler code and allows future optimizations.
Also remove no longer needed ide[_mm]_{inl,outl}() and ide_hwif_t.{INL,OUTL}.
v2:
* updated for scc_pata
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/pci/cy82c693.c')
-rw-r--r-- | drivers/ide/pci/cy82c693.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/ide/pci/cy82c693.c b/drivers/ide/pci/cy82c693.c index 603a7bebf117..103b9db97853 100644 --- a/drivers/ide/pci/cy82c693.c +++ b/drivers/ide/pci/cy82c693.c | |||
@@ -197,8 +197,8 @@ static void cy82c693_dma_enable (ide_drive_t *drive, int mode, int single) | |||
197 | #if CY82C693_DEBUG_LOGS | 197 | #if CY82C693_DEBUG_LOGS |
198 | /* for debug let's show the previous values */ | 198 | /* for debug let's show the previous values */ |
199 | 199 | ||
200 | HWIF(drive)->OUTB(index, CY82_INDEX_PORT); | 200 | outb(index, CY82_INDEX_PORT); |
201 | data = HWIF(drive)->INB(CY82_DATA_PORT); | 201 | data = inb(CY82_DATA_PORT); |
202 | 202 | ||
203 | printk (KERN_INFO "%s (ch=%d, dev=%d): DMA mode is %d (single=%d)\n", | 203 | printk (KERN_INFO "%s (ch=%d, dev=%d): DMA mode is %d (single=%d)\n", |
204 | drive->name, HWIF(drive)->channel, drive->select.b.unit, | 204 | drive->name, HWIF(drive)->channel, drive->select.b.unit, |
@@ -207,8 +207,8 @@ static void cy82c693_dma_enable (ide_drive_t *drive, int mode, int single) | |||
207 | 207 | ||
208 | data = (u8)mode|(u8)(single<<2); | 208 | data = (u8)mode|(u8)(single<<2); |
209 | 209 | ||
210 | HWIF(drive)->OUTB(index, CY82_INDEX_PORT); | 210 | outb(index, CY82_INDEX_PORT); |
211 | HWIF(drive)->OUTB(data, CY82_DATA_PORT); | 211 | outb(data, CY82_DATA_PORT); |
212 | 212 | ||
213 | #if CY82C693_DEBUG_INFO | 213 | #if CY82C693_DEBUG_INFO |
214 | printk(KERN_INFO "%s (ch=%d, dev=%d): set DMA mode to %d (single=%d)\n", | 214 | printk(KERN_INFO "%s (ch=%d, dev=%d): set DMA mode to %d (single=%d)\n", |
@@ -227,8 +227,8 @@ static void cy82c693_dma_enable (ide_drive_t *drive, int mode, int single) | |||
227 | */ | 227 | */ |
228 | 228 | ||
229 | data = BUSMASTER_TIMEOUT; | 229 | data = BUSMASTER_TIMEOUT; |
230 | HWIF(drive)->OUTB(CY82_INDEX_TIMEOUT, CY82_INDEX_PORT); | 230 | outb(CY82_INDEX_TIMEOUT, CY82_INDEX_PORT); |
231 | HWIF(drive)->OUTB(data, CY82_DATA_PORT); | 231 | outb(data, CY82_DATA_PORT); |
232 | 232 | ||
233 | #if CY82C693_DEBUG_INFO | 233 | #if CY82C693_DEBUG_INFO |
234 | printk (KERN_INFO "%s: Set IDE Bus Master TimeOut Register to 0x%X\n", | 234 | printk (KERN_INFO "%s: Set IDE Bus Master TimeOut Register to 0x%X\n", |