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/scsi | |
| 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/scsi')
| -rw-r--r-- | drivers/scsi/ipr.c | 4 | ||||
| -rw-r--r-- | drivers/scsi/libsas/sas_ata.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c index 081d14a326fe..6443ce7c41ae 100644 --- a/drivers/scsi/ipr.c +++ b/drivers/scsi/ipr.c | |||
| @@ -6219,8 +6219,8 @@ static struct ata_port_operations ipr_sata_ops = { | |||
| 6219 | }; | 6219 | }; |
| 6220 | 6220 | ||
| 6221 | static struct ata_port_info sata_port_info = { | 6221 | static struct ata_port_info sata_port_info = { |
| 6222 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | ATA_FLAG_SATA_RESET | | 6222 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | ATA_FLAG_MMIO | |
| 6223 | ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA, | 6223 | ATA_FLAG_PIO_DMA, |
| 6224 | .pio_mask = ATA_PIO4_ONLY, | 6224 | .pio_mask = ATA_PIO4_ONLY, |
| 6225 | .mwdma_mask = ATA_MWDMA2, | 6225 | .mwdma_mask = ATA_MWDMA2, |
| 6226 | .udma_mask = ATA_UDMA6, | 6226 | .udma_mask = ATA_UDMA6, |
diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c index fc6bdc51a047..996dbda47141 100644 --- a/drivers/scsi/libsas/sas_ata.c +++ b/drivers/scsi/libsas/sas_ata.c | |||
| @@ -372,8 +372,8 @@ static struct ata_port_operations sas_sata_ops = { | |||
| 372 | }; | 372 | }; |
| 373 | 373 | ||
| 374 | static struct ata_port_info sata_port_info = { | 374 | static struct ata_port_info sata_port_info = { |
| 375 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | ATA_FLAG_SATA_RESET | | 375 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | ATA_FLAG_MMIO | |
| 376 | ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA | ATA_FLAG_NCQ, | 376 | ATA_FLAG_PIO_DMA | ATA_FLAG_NCQ, |
| 377 | .pio_mask = ATA_PIO4, | 377 | .pio_mask = ATA_PIO4, |
| 378 | .mwdma_mask = ATA_MWDMA2, | 378 | .mwdma_mask = ATA_MWDMA2, |
| 379 | .udma_mask = ATA_UDMA6, | 379 | .udma_mask = ATA_UDMA6, |