diff options
author | Tejun Heo <htejun@gmail.com> | 2006-04-11 09:32:18 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-04-11 13:31:36 -0400 |
commit | 9466d85bb2c80b1aa169dda638b535f2f19714e4 (patch) | |
tree | ccba111574540f6f5807c028be3f92049e17fdb3 /drivers/scsi/sata_sil24.c | |
parent | 7dafc3fd9a9e34e4a02ee6d141fd391ad5bdcd90 (diff) |
[PATCH] sata_sil24: consolidate host flags into SIL24_COMMON_FLAGS
All sil24 controllers share the same host flags except for NPORTS.
Consolidate them into SIL24_COMMON_FLAGS.
Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/scsi/sata_sil24.c')
-rw-r--r-- | drivers/scsi/sata_sil24.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/drivers/scsi/sata_sil24.c b/drivers/scsi/sata_sil24.c index 1b648d67db1..50c2c6bcba6 100644 --- a/drivers/scsi/sata_sil24.c +++ b/drivers/scsi/sata_sil24.c | |||
@@ -218,6 +218,10 @@ enum { | |||
218 | BID_SIL3132 = 1, | 218 | BID_SIL3132 = 1, |
219 | BID_SIL3131 = 2, | 219 | BID_SIL3131 = 2, |
220 | 220 | ||
221 | /* host flags */ | ||
222 | SIL24_COMMON_FLAGS = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | | ||
223 | ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA, | ||
224 | |||
221 | IRQ_STAT_4PORTS = 0xf, | 225 | IRQ_STAT_4PORTS = 0xf, |
222 | }; | 226 | }; |
223 | 227 | ||
@@ -344,9 +348,7 @@ static struct ata_port_info sil24_port_info[] = { | |||
344 | /* sil_3124 */ | 348 | /* sil_3124 */ |
345 | { | 349 | { |
346 | .sht = &sil24_sht, | 350 | .sht = &sil24_sht, |
347 | .host_flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | | 351 | .host_flags = SIL24_COMMON_FLAGS | SIL24_NPORTS2FLAG(4), |
348 | ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA | | ||
349 | SIL24_NPORTS2FLAG(4), | ||
350 | .pio_mask = 0x1f, /* pio0-4 */ | 352 | .pio_mask = 0x1f, /* pio0-4 */ |
351 | .mwdma_mask = 0x07, /* mwdma0-2 */ | 353 | .mwdma_mask = 0x07, /* mwdma0-2 */ |
352 | .udma_mask = 0x3f, /* udma0-5 */ | 354 | .udma_mask = 0x3f, /* udma0-5 */ |
@@ -355,9 +357,7 @@ static struct ata_port_info sil24_port_info[] = { | |||
355 | /* sil_3132 */ | 357 | /* sil_3132 */ |
356 | { | 358 | { |
357 | .sht = &sil24_sht, | 359 | .sht = &sil24_sht, |
358 | .host_flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | | 360 | .host_flags = SIL24_COMMON_FLAGS | SIL24_NPORTS2FLAG(2), |
359 | ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA | | ||
360 | SIL24_NPORTS2FLAG(2), | ||
361 | .pio_mask = 0x1f, /* pio0-4 */ | 361 | .pio_mask = 0x1f, /* pio0-4 */ |
362 | .mwdma_mask = 0x07, /* mwdma0-2 */ | 362 | .mwdma_mask = 0x07, /* mwdma0-2 */ |
363 | .udma_mask = 0x3f, /* udma0-5 */ | 363 | .udma_mask = 0x3f, /* udma0-5 */ |
@@ -366,9 +366,7 @@ static struct ata_port_info sil24_port_info[] = { | |||
366 | /* sil_3131/sil_3531 */ | 366 | /* sil_3131/sil_3531 */ |
367 | { | 367 | { |
368 | .sht = &sil24_sht, | 368 | .sht = &sil24_sht, |
369 | .host_flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | | 369 | .host_flags = SIL24_COMMON_FLAGS | SIL24_NPORTS2FLAG(1), |
370 | ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA | | ||
371 | SIL24_NPORTS2FLAG(1), | ||
372 | .pio_mask = 0x1f, /* pio0-4 */ | 370 | .pio_mask = 0x1f, /* pio0-4 */ |
373 | .mwdma_mask = 0x07, /* mwdma0-2 */ | 371 | .mwdma_mask = 0x07, /* mwdma0-2 */ |
374 | .udma_mask = 0x3f, /* udma0-5 */ | 372 | .udma_mask = 0x3f, /* udma0-5 */ |