diff options
author | Sergei Shtylyov <sshtylyov@ru.mvista.com> | 2011-01-21 12:32:01 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2011-03-02 02:36:46 -0500 |
commit | 0f2e0330a85d351b0300583da1e335690c86bdd7 (patch) | |
tree | 8f74e1d3194474c95656f764e3b23686b8b6a09e | |
parent | 14080fa65516d15bc284c77a5dde31621a61e2bc (diff) |
ipr/sas_ata: use mode mask macros from <linux/ata.h>
Commit 14bdef982caeda19afe34010482867c18217c641 ([libata] convert drivers to
use ata.h mode mask defines) didn't convert these two libata driver outside
drivers/ata/...
Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
-rw-r--r-- | drivers/scsi/ipr.c | 6 | ||||
-rw-r--r-- | drivers/scsi/libsas/sas_ata.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c index 9c5c8be72231..081d14a326fe 100644 --- a/drivers/scsi/ipr.c +++ b/drivers/scsi/ipr.c | |||
@@ -6221,9 +6221,9 @@ static struct ata_port_operations ipr_sata_ops = { | |||
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_SATA_RESET | |
6223 | ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA, | 6223 | ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA, |
6224 | .pio_mask = 0x10, /* pio4 */ | 6224 | .pio_mask = ATA_PIO4_ONLY, |
6225 | .mwdma_mask = 0x07, | 6225 | .mwdma_mask = ATA_MWDMA2, |
6226 | .udma_mask = 0x7f, /* udma0-6 */ | 6226 | .udma_mask = ATA_UDMA6, |
6227 | .port_ops = &ipr_sata_ops | 6227 | .port_ops = &ipr_sata_ops |
6228 | }; | 6228 | }; |
6229 | 6229 | ||
diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c index 8f56d5fbf6ec..fc6bdc51a047 100644 --- a/drivers/scsi/libsas/sas_ata.c +++ b/drivers/scsi/libsas/sas_ata.c | |||
@@ -374,8 +374,8 @@ static struct ata_port_operations sas_sata_ops = { | |||
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_SATA_RESET | |
376 | ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA | ATA_FLAG_NCQ, | 376 | ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA | ATA_FLAG_NCQ, |
377 | .pio_mask = 0x1f, /* PIO0-4 */ | 377 | .pio_mask = ATA_PIO4, |
378 | .mwdma_mask = 0x07, /* MWDMA0-2 */ | 378 | .mwdma_mask = ATA_MWDMA2, |
379 | .udma_mask = ATA_UDMA6, | 379 | .udma_mask = ATA_UDMA6, |
380 | .port_ops = &sas_sata_ops | 380 | .port_ops = &sas_sata_ops |
381 | }; | 381 | }; |