---

yaml
---
r: 96107
b: refs/heads/master
c: dca3c33
h: refs/heads/master
i:
  96105: 4f3b5b1
  96103: eadc0fa
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 31d9168d27fac127d449cb9fa252d880de872c7f
+refs/heads/master: dca3c33652e437ed02c30ed3eca3cecd0cc00838

trunk/drivers/ata/Kconfig

@@ -205,8 +205,8 @@ config SATA_VITESSE
 	  If unsure, say N.
 
 config SATA_INIC162X
-	tristate "Initio 162x SATA support"
-	depends on PCI
+	tristate "Initio 162x SATA support (HIGHLY EXPERIMENTAL)"
+	depends on PCI && EXPERIMENTAL
 	help
 	  This option enables support for Initio 162x Serial ATA.
 
@@ -697,15 +697,6 @@ config PATA_SCC
 
 	  If unsure, say N.
 
-config PATA_SCH
-	tristate "Intel SCH PATA support"
-	depends on PCI
-	help
-	  This option enables support for Intel SCH PATA on the Intel
-	  SCH (US15W, US15L, UL11L) series host controllers.
-
-	  If unsure, say N.
-
 config PATA_BF54X
 	tristate "Blackfin 54x ATAPI support"
 	depends on BF542 || BF548 || BF549

trunk/drivers/ata/Makefile

@@ -67,7 +67,6 @@ obj-$(CONFIG_PATA_SIS)		+= pata_sis.o
 obj-$(CONFIG_PATA_TRIFLEX)	+= pata_triflex.o
 obj-$(CONFIG_PATA_IXP4XX_CF)	+= pata_ixp4xx_cf.o
 obj-$(CONFIG_PATA_SCC)		+= pata_scc.o
-obj-$(CONFIG_PATA_SCH)		+= pata_sch.o
 obj-$(CONFIG_PATA_BF54X)	+= pata_bf54x.o
 obj-$(CONFIG_PATA_PLATFORM)	+= pata_platform.o
 obj-$(CONFIG_PATA_OF_PLATFORM)	+= pata_of_platform.o

trunk/drivers/ata/ahci.c

@@ -1267,7 +1267,9 @@ static int ahci_check_ready(struct ata_link *link)
 	void __iomem *port_mmio = ahci_port_base(link->ap);
 	u8 status = readl(port_mmio + PORT_TFDATA) & 0xFF;
 
-	return ata_check_ready(status);
+	if (!(status & ATA_BUSY))
+		return 1;
+	return 0;
 }
 
 static int ahci_softreset(struct ata_link *link, unsigned int *class,

trunk/drivers/ata/ata_generic.c

@@ -152,12 +152,6 @@ static int ata_generic_init_one(struct pci_dev *dev, const struct pci_device_id
 	if (dev->vendor == PCI_VENDOR_ID_AL)
 		ata_pci_bmdma_clear_simplex(dev);
 
-	if (dev->vendor == PCI_VENDOR_ID_ATI) {
-		int rc = pcim_enable_device(dev);
-		if (rc < 0)
-			return rc;
-		pcim_pin_device(dev);
-	}
 	return ata_pci_sff_init_one(dev, ppi, &generic_sht, NULL);
 }
 

trunk/drivers/ata/ata_piix.c

@@ -1348,8 +1348,6 @@ static void __devinit piix_init_sidpr(struct ata_host *host)
 {
 	struct pci_dev *pdev = to_pci_dev(host->dev);
 	struct piix_host_priv *hpriv = host->private_data;
-	struct ata_device *dev0 = &host->ports[0]->link.device[0];
-	u32 scontrol;
 	int i;
 
 	/* check for availability */
@@ -1368,29 +1366,6 @@ static void __devinit piix_init_sidpr(struct ata_host *host)
 		return;
 
 	hpriv->sidpr = pcim_iomap_table(pdev)[PIIX_SIDPR_BAR];
-
-	/* SCR access via SIDPR doesn't work on some configurations.
-	 * Give it a test drive by inhibiting power save modes which
-	 * we'll do anyway.
-	 */
-	scontrol = piix_sidpr_read(dev0, SCR_CONTROL);
-
-	/* if IPM is already 3, SCR access is probably working.  Don't
-	 * un-inhibit power save modes as BIOS might have inhibited
-	 * them for a reason.
-	 */
-	if ((scontrol & 0xf00) != 0x300) {
-		scontrol |= 0x300;
-		piix_sidpr_write(dev0, SCR_CONTROL, scontrol);
-		scontrol = piix_sidpr_read(dev0, SCR_CONTROL);
-
-		if ((scontrol & 0xf00) != 0x300) {
-			dev_printk(KERN_INFO, host->dev, "SCR access via "
-				   "SIDPR is available but doesn't work\n");
-			return;
-		}
-	}
-
 	host->ports[0]->ops = &piix_sidpr_sata_ops;
 	host->ports[1]->ops = &piix_sidpr_sata_ops;
 }

trunk/drivers/ata/libata-core.c

@@ -6292,7 +6292,6 @@ EXPORT_SYMBOL_GPL(ata_eh_freeze_port);
 EXPORT_SYMBOL_GPL(ata_eh_thaw_port);
 EXPORT_SYMBOL_GPL(ata_eh_qc_complete);
 EXPORT_SYMBOL_GPL(ata_eh_qc_retry);
-EXPORT_SYMBOL_GPL(ata_eh_analyze_ncq_error);
 EXPORT_SYMBOL_GPL(ata_do_eh);
 EXPORT_SYMBOL_GPL(ata_std_error_handler);
 

trunk/drivers/ata/libata-eh.c

@@ -1357,7 +1357,7 @@ static void ata_eh_analyze_serror(struct ata_link *link)
  *	LOCKING:
  *	Kernel thread context (may sleep).
  */
-void ata_eh_analyze_ncq_error(struct ata_link *link)
+static void ata_eh_analyze_ncq_error(struct ata_link *link)
 {
 	struct ata_port *ap = link->ap;
 	struct ata_eh_context *ehc = &link->eh_context;

trunk/drivers/ata/libata-sff.c

@@ -314,7 +314,11 @@ static int ata_sff_check_ready(struct ata_link *link)
 {
 	u8 status = link->ap->ops->sff_check_status(link->ap);
 
-	return ata_check_ready(status);
+	if (!(status & ATA_BUSY))
+		return 1;
+	if (status == 0xff)
+		return -ENODEV;
+	return 0;
 }
 
 /**

trunk/drivers/ata/pata_acpi.c

@@ -259,12 +259,6 @@ static int pacpi_init_one (struct pci_dev *pdev, const struct pci_device_id *id)
 		.port_ops	= &pacpi_ops,
 	};
 	const struct ata_port_info *ppi[] = { &info, NULL };
-	if (pdev->vendor == PCI_VENDOR_ID_ATI) {
-		int rc = pcim_enable_device(pdev);
-		if (rc < 0)
-			return rc;
-		pcim_pin_device(pdev);
-	}
 	return ata_pci_sff_init_one(pdev, ppi, &pacpi_sht, NULL);
 }