From patchwork Mon Apr 5 13:36:21 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chase Douglas X-Patchwork-Id: 90619 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o35DaRJO007470 for ; Mon, 5 Apr 2010 13:36:27 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754663Ab0DENg0 (ORCPT ); Mon, 5 Apr 2010 09:36:26 -0400 Received: from adelie.canonical.com ([91.189.90.139]:56891 "EHLO adelie.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754465Ab0DENg0 (ORCPT ); Mon, 5 Apr 2010 09:36:26 -0400 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1NymTX-0002bd-Ba; Mon, 05 Apr 2010 14:36:23 +0100 Received: from cpe-75-180-27-10.columbus.res.rr.com ([75.180.27.10] helo=canonical.com) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.69) (envelope-from ) id 1NymTX-0000wj-2c; Mon, 05 Apr 2010 14:36:23 +0100 From: Chase Douglas To: linux-acpi@vger.kernel.org Cc: Len Brown Subject: [PATCH] Reduce ACPI resource conflict message to KERN_WARNING, printf cleanup Date: Mon, 5 Apr 2010 09:36:21 -0400 Message-Id: <1270474581-4348-1-git-send-email-chase.douglas@canonical.com> X-Mailer: git-send-email 1.7.0 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Mon, 05 Apr 2010 13:36:34 +0000 (UTC) diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index 02e8464..3b657a8 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c @@ -1151,16 +1151,10 @@ int acpi_check_resource_conflict(const struct resource *res) if (clash) { if (acpi_enforce_resources != ENFORCE_RESOURCES_NO) { - printk("%sACPI: %s resource %s [0x%llx-0x%llx]" - " conflicts with ACPI region %s" - " [0x%llx-0x%llx]\n", - acpi_enforce_resources == ENFORCE_RESOURCES_LAX - ? KERN_WARNING : KERN_ERR, - ioport ? "I/O" : "Memory", res->name, - (long long) res->start, (long long) res->end, - res_list_elem->name, - (long long) res_list_elem->start, - (long long) res_list_elem->end); + printk(KERN_WARNING "ACPI: resource %s %pR" + " conflicts with ACPI region %s %pR\n", + res->name, res, res_list_elem->name, + res_list_elem); if (acpi_enforce_resources == ENFORCE_RESOURCES_LAX) printk(KERN_NOTICE "ACPI: This conflict may" " cause random problems and system"