From patchwork Tue Jul 7 02:55:51 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhao, Yakui" X-Patchwork-Id: 34371 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n672t9Lm025798 for ; Tue, 7 Jul 2009 02:55:09 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754230AbZGGCzD (ORCPT ); Mon, 6 Jul 2009 22:55:03 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754525AbZGGCzD (ORCPT ); Mon, 6 Jul 2009 22:55:03 -0400 Received: from mga01.intel.com ([192.55.52.88]:40702 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754230AbZGGCzC (ORCPT ); Mon, 6 Jul 2009 22:55:02 -0400 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP; 06 Jul 2009 19:40:29 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.42,360,1243839600"; d="scan'208";a="472498301" Received: from yakui_zhao.sh.intel.com (HELO [10.239.13.62]) ([10.239.13.62]) by fmsmga002.fm.intel.com with ESMTP; 06 Jul 2009 19:48:36 -0700 Subject: [Patch 1/2]:ACPI: Don't treat generic error as ACPI error code in acpi memory hotplug driver From: yakui To: lenb@kernel.org Cc: linux-acpi@vger.kernel.org Date: Tue, 07 Jul 2009 10:55:51 +0800 Message-Id: <1246935351.14188.3.camel@localhost.localdomain> Mime-Version: 1.0 X-Mailer: Evolution 2.22.1 (2.22.1-2.fc9) Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org From: Zhao Yakui Don't regard the generic error as ACPI error code. Otherwise when the generic code is returned, it will complain the following warning messag: >ACPI Exception (acpi_memhotplug-0171): UNKNOWN_STATUS_CODE, Cannot get acpi bus device [20080609] >ACPI: Cannot find driver data > ACPI Error (utglobal-0127): Unknown exception code: 0xFFFFFFED [20080609] > Pid: 85, comm: kacpi_notify Not tainted 2.6.27.19-5-default #1 Call Trace: [] show_trace_log_lvl+0x41/0x58 [] dump_stack+0x69/0x6f ..... At the same time when the generic error code is returned, the ACPI_EXCEPTION is replaced by the printk. Signed-off-by: Zhao Yakui --- drivers/acpi/acpi_memhotplug.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: linux-2.6/drivers/acpi/acpi_memhotplug.c =================================================================== --- linux-2.6.orig/drivers/acpi/acpi_memhotplug.c 2009-07-06 13:32:36.000000000 +0800 +++ linux-2.6/drivers/acpi/acpi_memhotplug.c 2009-07-07 10:33:43.000000000 +0800 @@ -38,6 +38,9 @@ #define _COMPONENT ACPI_MEMORY_DEVICE_COMPONENT +#undef PREFIX +#define PREFIX "ACPI:memory_hp:" + ACPI_MODULE_NAME("acpi_memhotplug"); MODULE_AUTHOR("Naveen B S "); MODULE_DESCRIPTION("Hotplug Mem Driver"); @@ -153,6 +156,7 @@ acpi_handle phandle; struct acpi_device *device = NULL; struct acpi_device *pdevice = NULL; + int result; if (!acpi_bus_get_device(handle, &device) && device) @@ -165,9 +169,10 @@ } /* Get the parent device */ - status = acpi_bus_get_device(phandle, &pdevice); - if (ACPI_FAILURE(status)) { - ACPI_EXCEPTION((AE_INFO, status, "Cannot get acpi bus device")); + result = acpi_bus_get_device(phandle, &pdevice); + if (result) { + printk(KERN_WARNING PREFIX "Cannot get acpi bus device, " + "ret = %d\n", result); return -EINVAL; } @@ -175,9 +180,10 @@ * Now add the notified device. This creates the acpi_device * and invokes .add function */ - status = acpi_bus_add(&device, pdevice, handle, ACPI_BUS_TYPE_DEVICE); - if (ACPI_FAILURE(status)) { - ACPI_EXCEPTION((AE_INFO, status, "Cannot add acpi bus")); + result = acpi_bus_add(&device, pdevice, handle, ACPI_BUS_TYPE_DEVICE); + if (result) { + printk(KERN_WARNING PREFIX "Cannot add acpi bus, " + "ret = %d\n", result); return -EINVAL; }