diff options
author | Tejun Heo <htejun@gmail.com> | 2008-01-23 10:05:14 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2008-04-17 15:44:15 -0400 |
commit | d692abd92f22a81b38d52c39601871003262841c (patch) | |
tree | 4ff3f35d88762a52fb4d48adda1f39e1966b9f26 /drivers/ata/sata_sil.c | |
parent | cf48062658e7ab3bc55e10c65676c3c73c16f8bf (diff) |
libata: kill ATA_LFLAG_HRST_TO_RESUME
Now that hardreset is the preferred method of resetting, there's no
need for ATA_LFLAG_HRST_TO_RESUME flag. Kill it.
Signed-off-by: Tejun Heo <htejun@gmail.com>
Diffstat (limited to 'drivers/ata/sata_sil.c')
-rw-r--r-- | drivers/ata/sata_sil.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/ata/sata_sil.c b/drivers/ata/sata_sil.c index 0b8191b52f97..7052915a31b6 100644 --- a/drivers/ata/sata_sil.c +++ b/drivers/ata/sata_sil.c | |||
@@ -60,7 +60,6 @@ enum { | |||
60 | 60 | ||
61 | SIL_DFL_PORT_FLAGS = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | | 61 | SIL_DFL_PORT_FLAGS = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | |
62 | ATA_FLAG_MMIO, | 62 | ATA_FLAG_MMIO, |
63 | SIL_DFL_LINK_FLAGS = ATA_LFLAG_HRST_TO_RESUME, | ||
64 | 63 | ||
65 | /* | 64 | /* |
66 | * Controller IDs | 65 | * Controller IDs |
@@ -215,7 +214,6 @@ static const struct ata_port_info sil_port_info[] = { | |||
215 | /* sil_3112 */ | 214 | /* sil_3112 */ |
216 | { | 215 | { |
217 | .flags = SIL_DFL_PORT_FLAGS | SIL_FLAG_MOD15WRITE, | 216 | .flags = SIL_DFL_PORT_FLAGS | SIL_FLAG_MOD15WRITE, |
218 | .link_flags = SIL_DFL_LINK_FLAGS, | ||
219 | .pio_mask = 0x1f, /* pio0-4 */ | 217 | .pio_mask = 0x1f, /* pio0-4 */ |
220 | .mwdma_mask = 0x07, /* mwdma0-2 */ | 218 | .mwdma_mask = 0x07, /* mwdma0-2 */ |
221 | .udma_mask = ATA_UDMA5, | 219 | .udma_mask = ATA_UDMA5, |
@@ -225,7 +223,6 @@ static const struct ata_port_info sil_port_info[] = { | |||
225 | { | 223 | { |
226 | .flags = SIL_DFL_PORT_FLAGS | SIL_FLAG_MOD15WRITE | | 224 | .flags = SIL_DFL_PORT_FLAGS | SIL_FLAG_MOD15WRITE | |
227 | SIL_FLAG_NO_SATA_IRQ, | 225 | SIL_FLAG_NO_SATA_IRQ, |
228 | .link_flags = SIL_DFL_LINK_FLAGS, | ||
229 | .pio_mask = 0x1f, /* pio0-4 */ | 226 | .pio_mask = 0x1f, /* pio0-4 */ |
230 | .mwdma_mask = 0x07, /* mwdma0-2 */ | 227 | .mwdma_mask = 0x07, /* mwdma0-2 */ |
231 | .udma_mask = ATA_UDMA5, | 228 | .udma_mask = ATA_UDMA5, |
@@ -234,7 +231,6 @@ static const struct ata_port_info sil_port_info[] = { | |||
234 | /* sil_3512 */ | 231 | /* sil_3512 */ |
235 | { | 232 | { |
236 | .flags = SIL_DFL_PORT_FLAGS | SIL_FLAG_RERR_ON_DMA_ACT, | 233 | .flags = SIL_DFL_PORT_FLAGS | SIL_FLAG_RERR_ON_DMA_ACT, |
237 | .link_flags = SIL_DFL_LINK_FLAGS, | ||
238 | .pio_mask = 0x1f, /* pio0-4 */ | 234 | .pio_mask = 0x1f, /* pio0-4 */ |
239 | .mwdma_mask = 0x07, /* mwdma0-2 */ | 235 | .mwdma_mask = 0x07, /* mwdma0-2 */ |
240 | .udma_mask = ATA_UDMA5, | 236 | .udma_mask = ATA_UDMA5, |
@@ -243,7 +239,6 @@ static const struct ata_port_info sil_port_info[] = { | |||
243 | /* sil_3114 */ | 239 | /* sil_3114 */ |
244 | { | 240 | { |
245 | .flags = SIL_DFL_PORT_FLAGS | SIL_FLAG_RERR_ON_DMA_ACT, | 241 | .flags = SIL_DFL_PORT_FLAGS | SIL_FLAG_RERR_ON_DMA_ACT, |
246 | .link_flags = SIL_DFL_LINK_FLAGS, | ||
247 | .pio_mask = 0x1f, /* pio0-4 */ | 242 | .pio_mask = 0x1f, /* pio0-4 */ |
248 | .mwdma_mask = 0x07, /* mwdma0-2 */ | 243 | .mwdma_mask = 0x07, /* mwdma0-2 */ |
249 | .udma_mask = ATA_UDMA5, | 244 | .udma_mask = ATA_UDMA5, |