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/cs5530.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/cs5530.c')
-rw-r--r-- | drivers/ide/cs5530.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ide/cs5530.c b/drivers/ide/cs5530.c index 4ced40255ad6..4dc4eb92b076 100644 --- a/drivers/ide/cs5530.c +++ b/drivers/ide/cs5530.c | |||
@@ -100,12 +100,12 @@ out: | |||
100 | return mask; | 100 | return mask; |
101 | } | 101 | } |
102 | 102 | ||
103 | static void cs5530_set_dma_mode(ide_drive_t *drive, const u8 mode) | 103 | static void cs5530_set_dma_mode(ide_hwif_t *hwif, ide_drive_t *drive) |
104 | { | 104 | { |
105 | unsigned long basereg; | 105 | unsigned long basereg; |
106 | unsigned int reg, timings = 0; | 106 | unsigned int reg, timings = 0; |
107 | 107 | ||
108 | switch (mode) { | 108 | switch (drive->dma_mode) { |
109 | case XFER_UDMA_0: timings = 0x00921250; break; | 109 | case XFER_UDMA_0: timings = 0x00921250; break; |
110 | case XFER_UDMA_1: timings = 0x00911140; break; | 110 | case XFER_UDMA_1: timings = 0x00911140; break; |
111 | case XFER_UDMA_2: timings = 0x00911030; break; | 111 | case XFER_UDMA_2: timings = 0x00911030; break; |
@@ -113,7 +113,7 @@ static void cs5530_set_dma_mode(ide_drive_t *drive, const u8 mode) | |||
113 | case XFER_MW_DMA_1: timings = 0x00012121; break; | 113 | case XFER_MW_DMA_1: timings = 0x00012121; break; |
114 | case XFER_MW_DMA_2: timings = 0x00002020; break; | 114 | case XFER_MW_DMA_2: timings = 0x00002020; break; |
115 | } | 115 | } |
116 | basereg = CS5530_BASEREG(drive->hwif); | 116 | basereg = CS5530_BASEREG(hwif); |
117 | reg = inl(basereg + 4); /* get drive0 config register */ | 117 | reg = inl(basereg + 4); /* get drive0 config register */ |
118 | timings |= reg & 0x80000000; /* preserve PIO format bit */ | 118 | timings |= reg & 0x80000000; /* preserve PIO format bit */ |
119 | if ((drive-> dn & 1) == 0) { /* are we configuring drive0? */ | 119 | if ((drive-> dn & 1) == 0) { /* are we configuring drive0? */ |