Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9466d85b authored by Tejun Heo's avatar Tejun Heo Committed by Jeff Garzik
Browse files

[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: default avatarTejun Heo <htejun@gmail.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 7dafc3fd

drivers/scsi/sata_sil24.c

+7 −9
Original line number Diff line number Diff line
@@ -218,6 +218,10 @@ enum { 
	BID_SIL3132		= 1,

	BID_SIL3131		= 2,



	/* host flags */

	SIL24_COMMON_FLAGS	= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |

				  ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA,



	IRQ_STAT_4PORTS		= 0xf,

};
@@ -344,9 +348,7 @@ static struct ata_port_info sil24_port_info[] = { 
	/* sil_3124 */

	{

		.sht		= &sil24_sht,

		.host_flags	= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |

				  ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA |

				  SIL24_NPORTS2FLAG(4),

		.host_flags	= SIL24_COMMON_FLAGS | SIL24_NPORTS2FLAG(4),

		.pio_mask	= 0x1f,			/* pio0-4 */

		.mwdma_mask	= 0x07,			/* mwdma0-2 */

		.udma_mask	= 0x3f,			/* udma0-5 */
@@ -355,9 +357,7 @@ static struct ata_port_info sil24_port_info[] = { 
	/* sil_3132 */

	{

		.sht		= &sil24_sht,

		.host_flags	= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |

				  ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA |

				  SIL24_NPORTS2FLAG(2),

		.host_flags	= SIL24_COMMON_FLAGS | SIL24_NPORTS2FLAG(2),

		.pio_mask	= 0x1f,			/* pio0-4 */

		.mwdma_mask	= 0x07,			/* mwdma0-2 */

		.udma_mask	= 0x3f,			/* udma0-5 */
@@ -366,9 +366,7 @@ static struct ata_port_info sil24_port_info[] = { 
	/* sil_3131/sil_3531 */

	{

		.sht		= &sil24_sht,

		.host_flags	= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |

				  ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA |

				  SIL24_NPORTS2FLAG(1),

		.host_flags	= SIL24_COMMON_FLAGS | SIL24_NPORTS2FLAG(1),

		.pio_mask	= 0x1f,			/* pio0-4 */

		.mwdma_mask	= 0x07,			/* mwdma0-2 */

		.udma_mask	= 0x3f,			/* udma0-5 */