Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/pci/pci-acpi.c             |    8 ++------
 drivers/pci/pcie/aer/aerdrv.h      |    8 +++-----
 drivers/pci/pcie/aer/aerdrv_acpi.c |   15 ++++-----------
 drivers/pci/pcie/aer/aerdrv_core.c |   14 +++++++-------
 4 files changed, 16 insertions(+), 29 deletions(-)

diff -puN drivers/pci/pci-acpi.c~gregkh-pci-pci-reduce-aer-init-error-information drivers/pci/pci-acpi.c
--- a/drivers/pci/pci-acpi.c~gregkh-pci-pci-reduce-aer-init-error-information
+++ a/drivers/pci/pci-acpi.c
@@ -55,8 +55,6 @@ acpi_query_osc (
 
 	status = acpi_evaluate_object(handle, "_OSC", &input, &output);
 	if (ACPI_FAILURE (status)) {
-		printk(KERN_DEBUG  
-			"Evaluate _OSC Set fails. Status = 0x%04x\n", status);
 		*ret_status = status;
 		return status;
 	}
@@ -124,11 +122,9 @@ acpi_run_osc (
 	in_params[3].buffer.pointer 	= (u8 *)context;
 
 	status = acpi_evaluate_object(handle, "_OSC", &input, &output);
-	if (ACPI_FAILURE (status)) {
-		printk(KERN_DEBUG  
-			"Evaluate _OSC Set fails. Status = 0x%04x\n", status);
+	if (ACPI_FAILURE (status))
 		return status;
-	}
+
 	out_obj = output.pointer;
 	if (out_obj->type != ACPI_TYPE_BUFFER) {
 		printk(KERN_DEBUG  
diff -puN drivers/pci/pcie/aer/aerdrv.h~gregkh-pci-pci-reduce-aer-init-error-information drivers/pci/pcie/aer/aerdrv.h
--- a/drivers/pci/pcie/aer/aerdrv.h~gregkh-pci-pci-reduce-aer-init-error-information
+++ a/drivers/pci/pcie/aer/aerdrv.h
@@ -10,6 +10,8 @@
 
 #include <linux/workqueue.h>
 #include <linux/pcieport_if.h>
+#include <linux/acpi.h>
+#include <linux/pci-acpi.h>
 #include <linux/aer.h>
 
 #define AER_NONFATAL			0
@@ -19,10 +21,6 @@
 #define AER_ERROR_MASK			0x001fffff
 #define AER_ERROR(d)			(d & AER_ERROR_MASK)
 
-#define OSC_METHOD_RUN_SUCCESS		0
-#define OSC_METHOD_NOT_SUPPORTED	1
-#define OSC_METHOD_RUN_FAILURE		2
-
 /* Root Error Status Register Bits */
 #define ROOT_ERR_STATUS_MASKS			0x0f
 
@@ -121,6 +119,6 @@ extern void aer_delete_rootport(struct a
 extern int aer_init(struct pcie_device *dev);
 extern void aer_isr(struct work_struct *work);
 extern void aer_print_error(struct pci_dev *dev, struct aer_err_info *info);
-extern int aer_osc_setup(struct pci_dev *dev);
+extern acpi_status aer_osc_setup(struct pci_dev *dev);
 
 #endif //_AERDRV_H_
diff -puN drivers/pci/pcie/aer/aerdrv_acpi.c~gregkh-pci-pci-reduce-aer-init-error-information drivers/pci/pcie/aer/aerdrv_acpi.c
--- a/drivers/pci/pcie/aer/aerdrv_acpi.c~gregkh-pci-pci-reduce-aer-init-error-information
+++ a/drivers/pci/pcie/aer/aerdrv_acpi.c
@@ -27,10 +27,9 @@
  * Invoked when PCIE bus loads AER service driver. To avoid conflict with
  * BIOS AER support requires BIOS to yield AER control to OS native driver.
  **/
-int aer_osc_setup(struct pci_dev *dev)
+acpi_status aer_osc_setup(struct pci_dev *dev)
 {
-	int retval = OSC_METHOD_RUN_SUCCESS;
-	acpi_status status;
+	acpi_status status = AE_NOT_FOUND;
 	acpi_handle handle = DEVICE_ACPI_HANDLE(&dev->dev);
 	struct pci_dev *pdev = dev;
 	struct pci_bus *parent;
@@ -51,18 +50,12 @@ int aer_osc_setup(struct pci_dev *dev)
 	}
 
 	if (!handle)
-		return OSC_METHOD_NOT_SUPPORTED;
+		return status;
 
 	pci_osc_support_set(OSC_EXT_PCI_CONFIG_SUPPORT);
 	status = pci_osc_control_set(handle, OSC_PCI_EXPRESS_AER_CONTROL |
 		OSC_PCI_EXPRESS_CAP_STRUCTURE_CONTROL);
-	if (ACPI_FAILURE(status)) {
-		if (status == AE_SUPPORT)
-			retval = OSC_METHOD_NOT_SUPPORTED;
-	 	else
-			retval = OSC_METHOD_RUN_FAILURE;
-	}
 
-	return retval;
+	return status;
 }
 
diff -puN drivers/pci/pcie/aer/aerdrv_core.c~gregkh-pci-pci-reduce-aer-init-error-information drivers/pci/pcie/aer/aerdrv_core.c
--- a/drivers/pci/pcie/aer/aerdrv_core.c~gregkh-pci-pci-reduce-aer-init-error-information
+++ a/drivers/pci/pcie/aer/aerdrv_core.c
@@ -733,19 +733,19 @@ void aer_delete_rootport(struct aer_rpc 
  **/
 int aer_init(struct pcie_device *dev)
 {
-	int status;
+	acpi_status	status;
 
 	/* Run _OSC Method */
 	status = aer_osc_setup(dev->port);
 
-	if(status != OSC_METHOD_RUN_SUCCESS) {
-		printk(KERN_DEBUG "%s: AER service init fails - %s\n",
-		__FUNCTION__,
-		(status == OSC_METHOD_NOT_SUPPORTED) ?
-			"No ACPI _OSC support" : "Run ACPI _OSC fails");
+	if (ACPI_FAILURE(status)) {
+		printk(KERN_DEBUG "AER service couldn't init device %s - %s\n",
+		    dev->device.bus_id,
+		    (status == AE_SUPPORT || status == AE_NOT_FOUND) ?
+		    "no _OSC support" : "Run ACPI _OSC fails");
 
 		if (!forceload)
-			return status;
+			return -ENXIO;
 	}
 
 	return AER_SUCCESS;
_