diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-07-16 14:33:36 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-07-16 14:33:36 -0400 |
commit | bd887f72d2a28a8202519e67fd9ed93ee3c4e78d (patch) | |
tree | ce71b2dc1c1575b16846ea2b57f8c18f1f0fbf93 /drivers/ide/pci/cs5535.c | |
parent | 3be53f3f213223f50d8e29b5e1869685bf040a1e (diff) |
ide: remove XFER_* masks from ide-timing.h
* Check requested xfer mode against xfer modes instead of XFER_* masks
in ide_timing_compute() and cs5535.c::cs5535_set_speed().
* Remove XFER_[MODE,MWDMA,EPIO,PIO] masks.
There should be no functional changes caused by this patch.
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/pci/cs5535.c')
-rw-r--r-- | drivers/ide/pci/cs5535.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/ide/pci/cs5535.c b/drivers/ide/pci/cs5535.c index 99fe91a191b8..2a2cb4911905 100644 --- a/drivers/ide/pci/cs5535.c +++ b/drivers/ide/pci/cs5535.c | |||
@@ -75,13 +75,11 @@ static unsigned int cs5535_udma_timings[5] = | |||
75 | */ | 75 | */ |
76 | static void cs5535_set_speed(ide_drive_t *drive, const u8 speed) | 76 | static void cs5535_set_speed(ide_drive_t *drive, const u8 speed) |
77 | { | 77 | { |
78 | |||
79 | u32 reg = 0, dummy; | 78 | u32 reg = 0, dummy; |
80 | int unit = drive->select.b.unit; | 79 | int unit = drive->select.b.unit; |
81 | 80 | ||
82 | |||
83 | /* Set the PIO timings */ | 81 | /* Set the PIO timings */ |
84 | if ((speed & XFER_MODE) == XFER_PIO) { | 82 | if (speed < XFER_SW_DMA_0) { |
85 | ide_drive_t *pair = ide_get_paired_drive(drive); | 83 | ide_drive_t *pair = ide_get_paired_drive(drive); |
86 | u8 cmd, pioa; | 84 | u8 cmd, pioa; |
87 | 85 | ||