summaryrefslogtreecommitdiffstats
path: root/drivers/ide/triflex.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2010-01-19 01:45:29 -0800
committerDavid S. Miller <davem@davemloft.net>2010-01-19 01:45:29 -0800
commit8776168ca2151850164af1de5565d01f7b8b2c53 (patch)
tree28a44a3a649e1ab98f89674a06cc4c135a16d243 /drivers/ide/triflex.c
parente085b3cae85af47eb0a3eda3186bd898310fb322 (diff)
downloadop-kernel-dev-8776168ca2151850164af1de5565d01f7b8b2c53.zip
op-kernel-dev-8776168ca2151850164af1de5565d01f7b8b2c53.tar.gz
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/triflex.c')
-rw-r--r--drivers/ide/triflex.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ide/triflex.c b/drivers/ide/triflex.c
index d34a7ee..7953447 100644
--- a/drivers/ide/triflex.c
+++ b/drivers/ide/triflex.c
@@ -34,9 +34,8 @@
#define DRV_NAME "triflex"
-static void triflex_set_mode(ide_drive_t *drive, const u8 speed)
+static void triflex_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);
u32 triflex_timings = 0;
u16 timing = 0;
@@ -44,7 +43,7 @@ static void triflex_set_mode(ide_drive_t *drive, const u8 speed)
pci_read_config_dword(dev, channel_offset, &triflex_timings);
- switch(speed) {
+ switch (drive->dma_mode) {
case XFER_MW_DMA_2:
timing = 0x0103;
break;
@@ -84,7 +83,8 @@ static void triflex_set_mode(ide_drive_t *drive, const u8 speed)
static void triflex_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive)
{
- triflex_set_mode(drive, drive->pio_mode);
+ drive->dma_mode = drive->pio_mode;
+ triflex_set_mode(hwif, drive);
}
static const struct ide_port_ops triflex_port_ops = {
OpenPOWER on IntegriCloud