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

[PATCH] ata_piix: convert sata to new reset mechanism 



Convert ata_piix sata ->phy_reset to new reset mechanism.

Signed-off-by: default avatarTejun Heo <htejun@gmail.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@pobox.com>
parent 573db6b8

drivers/scsi/ata_piix.c

+15 −20
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ static int piix_init_one (struct pci_dev *pdev, 
				    const struct pci_device_id *ent);



static int piix_pata_probe_reset(struct ata_port *ap, unsigned int *classes);

static void piix_sata_phy_reset(struct ata_port *ap);

static int piix_sata_probe_reset(struct ata_port *ap, unsigned int *classes);

static void piix_set_piomode (struct ata_port *ap, struct ata_device *adev);

static void piix_set_dmamode (struct ata_port *ap, struct ata_device *adev);
@@ -235,7 +235,7 @@ static const struct ata_port_operations piix_sata_ops = { 
	.exec_command		= ata_exec_command,

	.dev_select		= ata_std_dev_select,



	.phy_reset		= piix_sata_phy_reset,

	.probe_reset		= piix_sata_probe_reset,



	.bmdma_setup		= ata_bmdma_setup,

	.bmdma_start		= ata_bmdma_start,
@@ -272,8 +272,8 @@ static struct ata_port_info piix_port_info[] = { 
	/* ich5_sata */

	{

		.sht		= &piix_sht,

		.host_flags	= ATA_FLAG_SATA | ATA_FLAG_SRST |

				  PIIX_FLAG_COMBINED | PIIX_FLAG_CHECKINTR,

		.host_flags	= ATA_FLAG_SATA | PIIX_FLAG_COMBINED |

				  PIIX_FLAG_CHECKINTR,

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

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

		.udma_mask	= 0x7f,	/* udma0-6 */
@@ -297,8 +297,7 @@ static struct ata_port_info piix_port_info[] = { 
	/* ich6_sata */

	{

		.sht		= &piix_sht,

		.host_flags	= ATA_FLAG_SATA | ATA_FLAG_SRST |

				  PIIX_FLAG_COMBINED_ICH6 |

		.host_flags	= ATA_FLAG_SATA | PIIX_FLAG_COMBINED_ICH6 |

				  PIIX_FLAG_CHECKINTR | ATA_FLAG_SLAVE_POSS,

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

		.mwdma_mask	= 0x07, /* mwdma0-2 */
@@ -309,8 +308,7 @@ static struct ata_port_info piix_port_info[] = { 
	/* ich6_sata_ahci */

	{

		.sht		= &piix_sht,

		.host_flags	= ATA_FLAG_SATA | ATA_FLAG_SRST |

				  PIIX_FLAG_COMBINED_ICH6 |

		.host_flags	= ATA_FLAG_SATA | PIIX_FLAG_COMBINED_ICH6 |

				  PIIX_FLAG_CHECKINTR | ATA_FLAG_SLAVE_POSS |

				  PIIX_FLAG_AHCI,

		.pio_mask	= 0x1f,	/* pio0-4 */
@@ -448,28 +446,25 @@ static int piix_sata_probe (struct ata_port *ap) 
}



/**

 *	piix_sata_phy_reset - Probe specified port on SATA host controller

 *	@ap: Port to probe

 *	piix_sata_probe_reset - Perform reset on SATA port and classify

 *	@ap: Port to reset

 *	@classes: Resulting classes of attached devices

 *

 *	Probe SATA phy.

 *	Reset SATA phy and classify attached devices.

 *

 *	LOCKING:

 *	None (inherited from caller).

 */



static void piix_sata_phy_reset(struct ata_port *ap)

static int piix_sata_probe_reset(struct ata_port *ap, unsigned int *classes)

{

	if (!piix_sata_probe(ap)) {

		ata_port_disable(ap);

		printk(KERN_INFO "ata%u: SATA port has no device.\n", ap->id);

		return;

		return 0;

	}



	ap->cbl = ATA_CBL_SATA;



	ata_port_probe(ap);



	ata_bus_reset(ap);

	return ata_drive_probe_reset(ap, ata_std_probeinit,

				     ata_std_softreset, NULL,

				     ata_std_postreset, classes);

}



/**