Commit 1d2808fd authored by Jeff Garzik's avatar Jeff Garzik
Browse files

[libata] PATA drivers: remove ATA_FLAG_SRST 



This flag only has meaning in old-EH drivers, and these drivers have
already been converted to the new EH.  Remove.

Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 5bcd7a00

drivers/ata/ata_generic.c

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ static int ata_generic_init_one(struct pci_dev *dev, const struct pci_device_id 
	u16 command;

	static const struct ata_port_info info = {

		.sht = &generic_sht,

		.flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,

		.flags = ATA_FLAG_SLAVE_POSS,

		.pio_mask = 0x1f,

		.mwdma_mask = 0x07,

		.udma_mask = 0x3f,

drivers/ata/pata_ali.c

+7 −7
Original line number Diff line number Diff line
@@ -520,14 +520,14 @@ static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id) 
{

	static const struct ata_port_info info_early = {

		.sht = &ali_sht,

		.flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,

		.flags = ATA_FLAG_SLAVE_POSS,

		.pio_mask = 0x1f,

		.port_ops = &ali_early_port_ops

	};

	/* Revision 0x20 added DMA */

	static const struct ata_port_info info_20 = {

		.sht = &ali_sht,

		.flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST | ATA_FLAG_PIO_LBA48,

		.flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_PIO_LBA48,

		.pio_mask = 0x1f,

		.mwdma_mask = 0x07,

		.port_ops = &ali_20_port_ops
@@ -535,7 +535,7 @@ static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id) 
	/* Revision 0x20 with support logic added UDMA */

	static const struct ata_port_info info_20_udma = {

		.sht = &ali_sht,

		.flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST | ATA_FLAG_PIO_LBA48,

		.flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_PIO_LBA48,

		.pio_mask = 0x1f,

		.mwdma_mask = 0x07,

		.udma_mask = 0x07,	/* UDMA33 */
@@ -544,7 +544,7 @@ static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id) 
	/* Revision 0xC2 adds UDMA66 */

	static const struct ata_port_info info_c2 = {

		.sht = &ali_sht,

		.flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST | ATA_FLAG_PIO_LBA48,

		.flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_PIO_LBA48,

		.pio_mask = 0x1f,

		.mwdma_mask = 0x07,

		.udma_mask = 0x1f,
@@ -553,7 +553,7 @@ static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id) 
	/* Revision 0xC3 is UDMA66 for now */

	static const struct ata_port_info info_c3 = {

		.sht = &ali_sht,

		.flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST | ATA_FLAG_PIO_LBA48,

		.flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_PIO_LBA48,

		.pio_mask = 0x1f,

		.mwdma_mask = 0x07,

		.udma_mask = 0x1f,
@@ -562,7 +562,7 @@ static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id) 
	/* Revision 0xC4 is UDMA100 */

	static const struct ata_port_info info_c4 = {

		.sht = &ali_sht,

		.flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST | ATA_FLAG_PIO_LBA48,

		.flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_PIO_LBA48,

		.pio_mask = 0x1f,

		.mwdma_mask = 0x07,

		.udma_mask = 0x3f,
@@ -571,7 +571,7 @@ static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id) 
	/* Revision 0xC5 is UDMA133 with LBA48 DMA */

	static const struct ata_port_info info_c5 = {

		.sht = &ali_sht,

		.flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,

		.flags = ATA_FLAG_SLAVE_POSS,

		.pio_mask = 0x1f,

		.mwdma_mask = 0x07,

		.udma_mask = 0x7f,

drivers/ata/pata_amd.c

+10 −10
Original line number Diff line number Diff line
@@ -541,7 +541,7 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id) 
	static const struct ata_port_info info[10] = {

		{	/* 0: AMD 7401 */

			.sht = &amd_sht,

			.flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,

			.flags = ATA_FLAG_SLAVE_POSS,

			.pio_mask = 0x1f,

			.mwdma_mask = 0x07,	/* No SWDMA */

			.udma_mask = 0x07,	/* UDMA 33 */
@@ -549,7 +549,7 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id) 
		},

		{	/* 1: Early AMD7409 - no swdma */

			.sht = &amd_sht,

			.flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,

			.flags = ATA_FLAG_SLAVE_POSS,

			.pio_mask = 0x1f,

			.mwdma_mask = 0x07,

			.udma_mask = 0x1f,	/* UDMA 66 */
@@ -557,7 +557,7 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id) 
		},

		{	/* 2: AMD 7409, no swdma errata */

			.sht = &amd_sht,

			.flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,

			.flags = ATA_FLAG_SLAVE_POSS,

			.pio_mask = 0x1f,

			.mwdma_mask = 0x07,

			.udma_mask = 0x1f,	/* UDMA 66 */
@@ -565,7 +565,7 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id) 
		},

		{	/* 3: AMD 7411 */

			.sht = &amd_sht,

			.flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,

			.flags = ATA_FLAG_SLAVE_POSS,

			.pio_mask = 0x1f,

			.mwdma_mask = 0x07,

			.udma_mask = 0x3f,	/* UDMA 100 */
@@ -573,7 +573,7 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id) 
		},

		{	/* 4: AMD 7441 */

			.sht = &amd_sht,

			.flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,

			.flags = ATA_FLAG_SLAVE_POSS,

			.pio_mask = 0x1f,

			.mwdma_mask = 0x07,

			.udma_mask = 0x3f,	/* UDMA 100 */
@@ -581,7 +581,7 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id) 
		},

		{	/* 5: AMD 8111*/

			.sht = &amd_sht,

			.flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,

			.flags = ATA_FLAG_SLAVE_POSS,

			.pio_mask = 0x1f,

			.mwdma_mask = 0x07,

			.udma_mask = 0x7f,	/* UDMA 133, no swdma */
@@ -589,7 +589,7 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id) 
		},

		{	/* 6: AMD 8111 UDMA 100 (Serenade) */

			.sht = &amd_sht,

			.flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,

			.flags = ATA_FLAG_SLAVE_POSS,

			.pio_mask = 0x1f,

			.mwdma_mask = 0x07,

			.udma_mask = 0x3f,	/* UDMA 100, no swdma */
@@ -597,7 +597,7 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id) 
		},

		{	/* 7: Nvidia Nforce */

			.sht = &amd_sht,

			.flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,

			.flags = ATA_FLAG_SLAVE_POSS,

			.pio_mask = 0x1f,

			.mwdma_mask = 0x07,

			.udma_mask = 0x3f,	/* UDMA 100 */
@@ -605,7 +605,7 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id) 
		},

		{	/* 8: Nvidia Nforce2 and later */

			.sht = &amd_sht,

			.flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,

			.flags = ATA_FLAG_SLAVE_POSS,

			.pio_mask = 0x1f,

			.mwdma_mask = 0x07,

			.udma_mask = 0x7f,	/* UDMA 133, no swdma */
@@ -613,7 +613,7 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id) 
		},

		{	/* 9: AMD CS5536 (Geode companion) */

			.sht = &amd_sht,

			.flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,

			.flags = ATA_FLAG_SLAVE_POSS,

			.pio_mask = 0x1f,

			.mwdma_mask = 0x07,

			.udma_mask = 0x3f,	/* UDMA 100 */

drivers/ata/pata_artop.c

+3 −3
Original line number Diff line number Diff line
@@ -416,7 +416,7 @@ static int artop_init_one (struct pci_dev *pdev, const struct pci_device_id *id) 
	static int printed_version;

	static const struct ata_port_info info_6210 = {

		.sht		= &artop_sht,

		.flags		= ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,

		.flags		= ATA_FLAG_SLAVE_POSS,

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

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

		.udma_mask 	= ATA_UDMA2,
@@ -424,7 +424,7 @@ static int artop_init_one (struct pci_dev *pdev, const struct pci_device_id *id) 
	};

	static const struct ata_port_info info_626x = {

		.sht		= &artop_sht,

		.flags		= ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,

		.flags		= ATA_FLAG_SLAVE_POSS,

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

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

		.udma_mask 	= ATA_UDMA4,
@@ -432,7 +432,7 @@ static int artop_init_one (struct pci_dev *pdev, const struct pci_device_id *id) 
	};

	static const struct ata_port_info info_626x_fast = {

		.sht		= &artop_sht,

		.flags		= ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,

		.flags		= ATA_FLAG_SLAVE_POSS,

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

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

		.udma_mask 	= ATA_UDMA5,

drivers/ata/pata_atiixp.c

+1 −1
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ static int atiixp_init_one(struct pci_dev *dev, const struct pci_device_id *id) 
{

	static const struct ata_port_info info = {

		.sht = &atiixp_sht,

		.flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,

		.flags = ATA_FLAG_SLAVE_POSS,

		.pio_mask = 0x1f,

		.mwdma_mask = 0x06,	/* No MWDMA0 support */

		.udma_mask = 0x3F,