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

Commit c10f97b9 authored Feb 04, 2011 by Sergei Shtylyov Committed by Jeff Garzik Mar 02, 2011

libata: remove ATA_FLAG_{SRST|SATA_RESET}



These flags are marked as obsolete and the checks for them have been removed
by commit 29444088 (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>

parent 0f2e0330

drivers/ata/pata_acpi.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -245,7 +245,7 @@ static struct ata_port_operations pacpi_ops = {
		static int pacpi_init_one (struct pci_dev pdev, const struct pci_device_id id)
		{
		static const struct ata_port_info info = {
		.flags = ATA_FLAG_SLAVE_POSS \| ATA_FLAG_SRST,
		.flags = ATA_FLAG_SLAVE_POSS,

		.pio_mask = ATA_PIO4,
		.mwdma_mask = ATA_MWDMA2,

drivers/ata/pata_sis.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -593,7 +593,7 @@ static const struct ata_port_info sis_info133 = {
		.port_ops = &sis_133_ops,
		};
		const struct ata_port_info sis_info133_for_sata = {
		.flags = ATA_FLAG_SLAVE_POSS \| ATA_FLAG_SRST,
		.flags = ATA_FLAG_SLAVE_POSS,
		.pio_mask = ATA_PIO4,
		/* No MWDMA */
		.udma_mask = ATA_UDMA6,

drivers/ata/sata_sx4.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -274,8 +274,8 @@ static const struct ata_port_info pdc_port_info[] = {
		/* board_20621 */
		{
		.flags = ATA_FLAG_SATA \| ATA_FLAG_NO_LEGACY \|
		ATA_FLAG_SRST \| ATA_FLAG_MMIO \|
		ATA_FLAG_NO_ATAPI \| ATA_FLAG_PIO_POLLING,
		ATA_FLAG_MMIO \| ATA_FLAG_NO_ATAPI \|
		ATA_FLAG_PIO_POLLING,
		.pio_mask = ATA_PIO4,
		.mwdma_mask = ATA_MWDMA2,
		.udma_mask = ATA_UDMA6,

drivers/scsi/ipr.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -6219,8 +6219,8 @@ static struct ata_port_operations ipr_sata_ops = {
		};

		static struct ata_port_info sata_port_info = {
		.flags = ATA_FLAG_SATA \| ATA_FLAG_NO_LEGACY \| ATA_FLAG_SATA_RESET \|
		ATA_FLAG_MMIO \| ATA_FLAG_PIO_DMA,
		.flags = ATA_FLAG_SATA \| ATA_FLAG_NO_LEGACY \| ATA_FLAG_MMIO \|
		ATA_FLAG_PIO_DMA,
		.pio_mask = ATA_PIO4_ONLY,
		.mwdma_mask = ATA_MWDMA2,
		.udma_mask = ATA_UDMA6,

drivers/scsi/libsas/sas_ata.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -372,8 +372,8 @@ static struct ata_port_operations sas_sata_ops = {
		};

		static struct ata_port_info sata_port_info = {
		.flags = ATA_FLAG_SATA \| ATA_FLAG_NO_LEGACY \| ATA_FLAG_SATA_RESET \|
		ATA_FLAG_MMIO \| ATA_FLAG_PIO_DMA \| ATA_FLAG_NCQ,
		.flags = ATA_FLAG_SATA \| ATA_FLAG_NO_LEGACY \| ATA_FLAG_MMIO \|
		ATA_FLAG_PIO_DMA \| ATA_FLAG_NCQ,
		.pio_mask = ATA_PIO4,
		.mwdma_mask = ATA_MWDMA2,
		.udma_mask = ATA_UDMA6,