diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2010-01-19 04:45:29 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-01-19 04:45:29 -0500 |
commit | 8776168ca2151850164af1de5565d01f7b8b2c53 (patch) | |
tree | 28a44a3a649e1ab98f89674a06cc4c135a16d243 /drivers/ide/piix.c | |
parent | e085b3cae85af47eb0a3eda3186bd898310fb322 (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/piix.c')
-rw-r--r-- | drivers/ide/piix.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ide/piix.c b/drivers/ide/piix.c index 64b3041daa60..1bdca49e5a03 100644 --- a/drivers/ide/piix.c +++ b/drivers/ide/piix.c | |||
@@ -127,16 +127,15 @@ static void piix_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive) | |||
127 | 127 | ||
128 | /** | 128 | /** |
129 | * piix_set_dma_mode - set host controller for DMA mode | 129 | * piix_set_dma_mode - set host controller for DMA mode |
130 | * @hwif: port | ||
130 | * @drive: drive | 131 | * @drive: drive |
131 | * @speed: DMA mode | ||
132 | * | 132 | * |
133 | * Set a PIIX host controller to the desired DMA mode. This involves | 133 | * Set a PIIX host controller to the desired DMA mode. This involves |
134 | * programming the right timing data into the PCI configuration space. | 134 | * programming the right timing data into the PCI configuration space. |
135 | */ | 135 | */ |
136 | 136 | ||
137 | static void piix_set_dma_mode(ide_drive_t *drive, const u8 speed) | 137 | static void piix_set_dma_mode(ide_hwif_t *hwif, ide_drive_t *drive) |
138 | { | 138 | { |
139 | ide_hwif_t *hwif = drive->hwif; | ||
140 | struct pci_dev *dev = to_pci_dev(hwif->dev); | 139 | struct pci_dev *dev = to_pci_dev(hwif->dev); |
141 | u8 maslave = hwif->channel ? 0x42 : 0x40; | 140 | u8 maslave = hwif->channel ? 0x42 : 0x40; |
142 | int a_speed = 3 << (drive->dn * 4); | 141 | int a_speed = 3 << (drive->dn * 4); |
@@ -147,6 +146,7 @@ static void piix_set_dma_mode(ide_drive_t *drive, const u8 speed) | |||
147 | int sitre; | 146 | int sitre; |
148 | u16 reg4042, reg4a; | 147 | u16 reg4042, reg4a; |
149 | u8 reg48, reg54, reg55; | 148 | u8 reg48, reg54, reg55; |
149 | const u8 speed = drive->dma_mode; | ||
150 | 150 | ||
151 | pci_read_config_word(dev, maslave, ®4042); | 151 | pci_read_config_word(dev, maslave, ®4042); |
152 | sitre = (reg4042 & 0x4000) ? 1 : 0; | 152 | sitre = (reg4042 & 0x4000) ? 1 : 0; |