diff options
Diffstat (limited to 'drivers/ata/pata_winbond.c')
-rw-r--r-- | drivers/ata/pata_winbond.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/ata/pata_winbond.c b/drivers/ata/pata_winbond.c index 5d1f518e1cc7..022da95a3389 100644 --- a/drivers/ata/pata_winbond.c +++ b/drivers/ata/pata_winbond.c | |||
@@ -5,7 +5,7 @@ | |||
5 | * Support for the Winbond 83759A when operating in advanced mode. | 5 | * Support for the Winbond 83759A when operating in advanced mode. |
6 | * Multichip mode is not currently supported. | 6 | * Multichip mode is not currently supported. |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include <linux/kernel.h> | 9 | #include <linux/kernel.h> |
10 | #include <linux/module.h> | 10 | #include <linux/module.h> |
11 | #include <linux/pci.h> | 11 | #include <linux/pci.h> |
@@ -69,7 +69,7 @@ static void winbond_set_piomode(struct ata_port *ap, struct ata_device *adev) | |||
69 | int timing = 0x88 + (ap->port_no * 4) + (adev->devno * 2); | 69 | int timing = 0x88 + (ap->port_no * 4) + (adev->devno * 2); |
70 | 70 | ||
71 | reg = winbond_readcfg(winbond->config, 0x81); | 71 | reg = winbond_readcfg(winbond->config, 0x81); |
72 | 72 | ||
73 | /* Get the timing data in cycles */ | 73 | /* Get the timing data in cycles */ |
74 | if (reg & 0x40) /* Fast VLB bus, assume 50MHz */ | 74 | if (reg & 0x40) /* Fast VLB bus, assume 50MHz */ |
75 | ata_timing_compute(adev, adev->pio_mode, &t, 20000, 1000); | 75 | ata_timing_compute(adev, adev->pio_mode, &t, 20000, 1000); |
@@ -80,9 +80,9 @@ static void winbond_set_piomode(struct ata_port *ap, struct ata_device *adev) | |||
80 | recovery = (FIT(t.recover, 1, 15) + 1) & 0x0F; | 80 | recovery = (FIT(t.recover, 1, 15) + 1) & 0x0F; |
81 | timing = (active << 4) | recovery; | 81 | timing = (active << 4) | recovery; |
82 | winbond_writecfg(winbond->config, timing, reg); | 82 | winbond_writecfg(winbond->config, timing, reg); |
83 | 83 | ||
84 | /* Load the setup timing */ | 84 | /* Load the setup timing */ |
85 | 85 | ||
86 | reg = 0x35; | 86 | reg = 0x35; |
87 | if (adev->class != ATA_DEV_ATA) | 87 | if (adev->class != ATA_DEV_ATA) |
88 | reg |= 0x08; /* FIFO off */ | 88 | reg |= 0x08; /* FIFO off */ |
@@ -194,13 +194,13 @@ static __init int winbond_init_one(unsigned long port) | |||
194 | winbond_writecfg(port, 0x85, reg); | 194 | winbond_writecfg(port, 0x85, reg); |
195 | 195 | ||
196 | reg = winbond_readcfg(port, 0x81); | 196 | reg = winbond_readcfg(port, 0x81); |
197 | 197 | ||
198 | if (!(reg & 0x03)) /* Disabled */ | 198 | if (!(reg & 0x03)) /* Disabled */ |
199 | return 0; | 199 | return 0; |
200 | 200 | ||
201 | for (i = 0; i < 2 ; i ++) { | 201 | for (i = 0; i < 2 ; i ++) { |
202 | 202 | ||
203 | if (reg & (1 << i)) { | 203 | if (reg & (1 << i)) { |
204 | /* | 204 | /* |
205 | * Fill in a probe structure first of all | 205 | * Fill in a probe structure first of all |
206 | */ | 206 | */ |
@@ -217,7 +217,7 @@ static __init int winbond_init_one(unsigned long port) | |||
217 | ae.pio_mask = 0x1F; | 217 | ae.pio_mask = 0x1F; |
218 | 218 | ||
219 | ae.sht = &winbond_sht; | 219 | ae.sht = &winbond_sht; |
220 | 220 | ||
221 | ae.n_ports = 1; | 221 | ae.n_ports = 1; |
222 | ae.irq = 14 + i; | 222 | ae.irq = 14 + i; |
223 | ae.irq_flags = 0; | 223 | ae.irq_flags = 0; |
@@ -257,7 +257,7 @@ static __init int winbond_init(void) | |||
257 | 257 | ||
258 | int ct = 0; | 258 | int ct = 0; |
259 | int i; | 259 | int i; |
260 | 260 | ||
261 | if (probe_winbond == 0) | 261 | if (probe_winbond == 0) |
262 | return -ENODEV; | 262 | return -ENODEV; |
263 | 263 | ||