aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/amd74xx.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2010-01-19 04:45:29 -0500
committerDavid S. Miller <davem@davemloft.net>2010-01-19 04:45:29 -0500
commit8776168ca2151850164af1de5565d01f7b8b2c53 (patch)
tree28a44a3a649e1ab98f89674a06cc4c135a16d243 /drivers/ide/amd74xx.c
parente085b3cae85af47eb0a3eda3186bd898310fb322 (diff)
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/amd74xx.c')
-rw-r--r--drivers/ide/amd74xx.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/ide/amd74xx.c b/drivers/ide/amd74xx.c
index 3eee7be7ca6f..b7e105338205 100644
--- a/drivers/ide/amd74xx.c
+++ b/drivers/ide/amd74xx.c
@@ -79,14 +79,14 @@ static void amd_set_speed(struct pci_dev *dev, u8 dn, u8 udma_mask,
79 * to a desired transfer mode. It also can be called by upper layers. 79 * to a desired transfer mode. It also can be called by upper layers.
80 */ 80 */
81 81
82static void amd_set_drive(ide_drive_t *drive, const u8 speed) 82static void amd_set_drive(ide_hwif_t *hwif, ide_drive_t *drive)
83{ 83{
84 ide_hwif_t *hwif = drive->hwif;
85 struct pci_dev *dev = to_pci_dev(hwif->dev); 84 struct pci_dev *dev = to_pci_dev(hwif->dev);
86 ide_drive_t *peer = ide_get_pair_dev(drive); 85 ide_drive_t *peer = ide_get_pair_dev(drive);
87 struct ide_timing t, p; 86 struct ide_timing t, p;
88 int T, UT; 87 int T, UT;
89 u8 udma_mask = hwif->ultra_mask; 88 u8 udma_mask = hwif->ultra_mask;
89 const u8 speed = drive->dma_mode;
90 90
91 T = 1000000000 / amd_clock; 91 T = 1000000000 / amd_clock;
92 UT = (udma_mask == ATA_UDMA2) ? T : (T / 2); 92 UT = (udma_mask == ATA_UDMA2) ? T : (T / 2);
@@ -110,7 +110,8 @@ static void amd_set_drive(ide_drive_t *drive, const u8 speed)
110 110
111static void amd_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive) 111static void amd_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive)
112{ 112{
113 amd_set_drive(drive, drive->pio_mode); 113 drive->dma_mode = drive->pio_mode;
114 amd_set_drive(hwif, drive);
114} 115}
115 116
116static void amd7409_cable_detect(struct pci_dev *dev) 117static void amd7409_cable_detect(struct pci_dev *dev)