diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-07-09 16:34:25 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-09 16:34:25 -0400 |
| commit | f974a8ec96571535ee07880a023bcce0e3f2c76b (patch) | |
| tree | 5cf09207b1ad292a55275cd0b24999fa29b9dfe8 /drivers/ata/pata_winbond.c | |
| parent | c0b8556f2f8146bd38324b14b1ce00f249ba8ed9 (diff) | |
| parent | 4ed47896935573c8423d05bddda3f269d6e6c613 (diff) | |
Merge branch 'machtypes' into pxa-palm
Diffstat (limited to 'drivers/ata/pata_winbond.c')
| -rw-r--r-- | drivers/ata/pata_winbond.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ata/pata_winbond.c b/drivers/ata/pata_winbond.c index 6e52a3573fbf..474528f8fe3d 100644 --- a/drivers/ata/pata_winbond.c +++ b/drivers/ata/pata_winbond.c | |||
| @@ -75,8 +75,8 @@ static void winbond_set_piomode(struct ata_port *ap, struct ata_device *adev) | |||
| 75 | else | 75 | else |
| 76 | ata_timing_compute(adev, adev->pio_mode, &t, 30303, 1000); | 76 | ata_timing_compute(adev, adev->pio_mode, &t, 30303, 1000); |
| 77 | 77 | ||
| 78 | active = (FIT(t.active, 3, 17) - 1) & 0x0F; | 78 | active = (clamp_val(t.active, 3, 17) - 1) & 0x0F; |
| 79 | recovery = (FIT(t.recover, 1, 15) + 1) & 0x0F; | 79 | recovery = (clamp_val(t.recover, 1, 15) + 1) & 0x0F; |
| 80 | timing = (active << 4) | recovery; | 80 | timing = (active << 4) | recovery; |
| 81 | winbond_writecfg(winbond->config, timing, reg); | 81 | winbond_writecfg(winbond->config, timing, reg); |
| 82 | 82 | ||
| @@ -87,7 +87,7 @@ static void winbond_set_piomode(struct ata_port *ap, struct ata_device *adev) | |||
| 87 | reg |= 0x08; /* FIFO off */ | 87 | reg |= 0x08; /* FIFO off */ |
| 88 | if (!ata_pio_need_iordy(adev)) | 88 | if (!ata_pio_need_iordy(adev)) |
| 89 | reg |= 0x02; /* IORDY off */ | 89 | reg |= 0x02; /* IORDY off */ |
| 90 | reg |= (FIT(t.setup, 0, 3) << 6); | 90 | reg |= (clamp_val(t.setup, 0, 3) << 6); |
| 91 | winbond_writecfg(winbond->config, timing + 1, reg); | 91 | winbond_writecfg(winbond->config, timing + 1, reg); |
| 92 | } | 92 | } |
| 93 | 93 | ||