diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2010-01-19 10:45:29 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-01-19 10:45:29 +0100 |
| commit | 8776168ca2151850164af1de5565d01f7b8b2c53 (patch) | |
| tree | 28a44a3a649e1ab98f89674a06cc4c135a16d243 /drivers/ide/hpt366.c | |
| parent | ide: change ->set_pio_mode method parameters (diff) | |
| download | linux-8776168ca2151850164af1de5565d01f7b8b2c53.tar.xz linux-8776168ca2151850164af1de5565d01f7b8b2c53.zip | |
ide: change ->set_dma_mode method parameters
Change ->set_dma_mode method parameters to match ->set_dmamode method
used in struct ata_port_operations.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/hpt366.c')
| -rw-r--r-- | drivers/ide/hpt366.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/ide/hpt366.c b/drivers/ide/hpt366.c index f1dec519a9e6..b885c1d548f5 100644 --- a/drivers/ide/hpt366.c +++ b/drivers/ide/hpt366.c @@ -627,14 +627,14 @@ static u32 get_speed_setting(u8 speed, struct hpt_info *info) return info->timings->clock_table[info->clock][i]; } -static void hpt3xx_set_mode(ide_drive_t *drive, const u8 speed) +static void hpt3xx_set_mode(ide_hwif_t *hwif, ide_drive_t *drive) { - ide_hwif_t *hwif = drive->hwif; struct pci_dev *dev = to_pci_dev(hwif->dev); struct hpt_info *info = hpt3xx_get_info(hwif->dev); struct hpt_timings *t = info->timings; u8 itr_addr = 0x40 + (drive->dn * 4); u32 old_itr = 0; + const u8 speed = drive->dma_mode; u32 new_itr = get_speed_setting(speed, info); u32 itr_mask = speed < XFER_MW_DMA_0 ? t->pio_mask : (speed < XFER_UDMA_0 ? t->dma_mask : @@ -653,7 +653,8 @@ static void hpt3xx_set_mode(ide_drive_t *drive, const u8 speed) static void hpt3xx_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive) { - hpt3xx_set_mode(drive, drive->pio_mode); + drive->dma_mode = drive->pio_mode; + hpt3xx_set_mode(hwif, drive); } static void hpt3xx_maskproc(ide_drive_t *drive, int mask) |