diff options
author | Sergei Shtylyov <sshtylyov@ru.mvista.com> | 2011-02-04 14:03:34 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2011-03-02 02:36:46 -0500 |
commit | c10f97b9d8df818e51e6073be1b96454630595c1 (patch) | |
tree | 2837ef82cff20a04cb126a3eb06a01db8dcd76f7 /drivers/ata | |
parent | 0f2e0330a85d351b0300583da1e335690c86bdd7 (diff) |
libata: remove ATA_FLAG_{SRST|SATA_RESET}
These flags are marked as obsolete and the checks for them have been removed
by commit 294440887b32c58d220fb54b73b7a58079b78f20 (libata-sff: kill unused
ata_bus_reset()), so I think it's time to finally get rid of them...
Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/ata')
-rw-r--r-- | drivers/ata/pata_acpi.c | 2 | ||||
-rw-r--r-- | drivers/ata/pata_sis.c | 2 | ||||
-rw-r--r-- | drivers/ata/sata_sx4.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ata/pata_acpi.c b/drivers/ata/pata_acpi.c index c8d47034d5e9..91949d997555 100644 --- a/drivers/ata/pata_acpi.c +++ b/drivers/ata/pata_acpi.c | |||
@@ -245,7 +245,7 @@ static struct ata_port_operations pacpi_ops = { | |||
245 | static int pacpi_init_one (struct pci_dev *pdev, const struct pci_device_id *id) | 245 | static int pacpi_init_one (struct pci_dev *pdev, const struct pci_device_id *id) |
246 | { | 246 | { |
247 | static const struct ata_port_info info = { | 247 | static const struct ata_port_info info = { |
248 | .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST, | 248 | .flags = ATA_FLAG_SLAVE_POSS, |
249 | 249 | ||
250 | .pio_mask = ATA_PIO4, | 250 | .pio_mask = ATA_PIO4, |
251 | .mwdma_mask = ATA_MWDMA2, | 251 | .mwdma_mask = ATA_MWDMA2, |
diff --git a/drivers/ata/pata_sis.c b/drivers/ata/pata_sis.c index 60cea13cccce..c04abc393fc5 100644 --- a/drivers/ata/pata_sis.c +++ b/drivers/ata/pata_sis.c | |||
@@ -593,7 +593,7 @@ static const struct ata_port_info sis_info133 = { | |||
593 | .port_ops = &sis_133_ops, | 593 | .port_ops = &sis_133_ops, |
594 | }; | 594 | }; |
595 | const struct ata_port_info sis_info133_for_sata = { | 595 | const struct ata_port_info sis_info133_for_sata = { |
596 | .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST, | 596 | .flags = ATA_FLAG_SLAVE_POSS, |
597 | .pio_mask = ATA_PIO4, | 597 | .pio_mask = ATA_PIO4, |
598 | /* No MWDMA */ | 598 | /* No MWDMA */ |
599 | .udma_mask = ATA_UDMA6, | 599 | .udma_mask = ATA_UDMA6, |
diff --git a/drivers/ata/sata_sx4.c b/drivers/ata/sata_sx4.c index bedd5188e5b0..76384d077b2d 100644 --- a/drivers/ata/sata_sx4.c +++ b/drivers/ata/sata_sx4.c | |||
@@ -274,8 +274,8 @@ static const struct ata_port_info pdc_port_info[] = { | |||
274 | /* board_20621 */ | 274 | /* board_20621 */ |
275 | { | 275 | { |
276 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | | 276 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | |
277 | ATA_FLAG_SRST | ATA_FLAG_MMIO | | 277 | ATA_FLAG_MMIO | ATA_FLAG_NO_ATAPI | |
278 | ATA_FLAG_NO_ATAPI | ATA_FLAG_PIO_POLLING, | 278 | ATA_FLAG_PIO_POLLING, |
279 | .pio_mask = ATA_PIO4, | 279 | .pio_mask = ATA_PIO4, |
280 | .mwdma_mask = ATA_MWDMA2, | 280 | .mwdma_mask = ATA_MWDMA2, |
281 | .udma_mask = ATA_UDMA6, | 281 | .udma_mask = ATA_UDMA6, |