aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/ata/pata_octeon_cf.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/ata/pata_octeon_cf.c b/drivers/ata/pata_octeon_cf.c
index e94e7ca0e743..f524a9099d01 100644
--- a/drivers/ata/pata_octeon_cf.c
+++ b/drivers/ata/pata_octeon_cf.c
@@ -138,9 +138,7 @@ static void octeon_cf_set_piomode(struct ata_port *ap, struct ata_device *dev)
138 int trh; 138 int trh;
139 int pause; 139 int pause;
140 /* These names are timing parameters from the ATA spec */ 140 /* These names are timing parameters from the ATA spec */
141 int t1;
142 int t2; 141 int t2;
143 int t2i;
144 142
145 /* 143 /*
146 * A divisor value of four will overflow the timing fields at 144 * A divisor value of four will overflow the timing fields at
@@ -154,15 +152,9 @@ static void octeon_cf_set_piomode(struct ata_port *ap, struct ata_device *dev)
154 152
155 BUG_ON(ata_timing_compute(dev, dev->pio_mode, &timing, T, T)); 153 BUG_ON(ata_timing_compute(dev, dev->pio_mode, &timing, T, T));
156 154
157 t1 = timing.setup;
158 if (t1)
159 t1--;
160 t2 = timing.active; 155 t2 = timing.active;
161 if (t2) 156 if (t2)
162 t2--; 157 t2--;
163 t2i = timing.act8b;
164 if (t2i)
165 t2i--;
166 158
167 trh = ns_to_tim_reg(div, 20); 159 trh = ns_to_tim_reg(div, 20);
168 if (trh) 160 if (trh)