From patchwork Mon Jun 3 13:16:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiang Liu X-Patchwork-Id: 2652311 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id DED4DDF24C for ; Mon, 3 Jun 2013 13:18:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757616Ab3FCNSt (ORCPT ); Mon, 3 Jun 2013 09:18:49 -0400 Received: from mail-pb0-f52.google.com ([209.85.160.52]:42125 "EHLO mail-pb0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757521Ab3FCNSs (ORCPT ); Mon, 3 Jun 2013 09:18:48 -0400 Received: by mail-pb0-f52.google.com with SMTP id xa12so5646574pbc.25 for ; Mon, 03 Jun 2013 06:18:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=0F8ANfRWxkktTiecvIhjMyhyOYQHKZBv9bnpyjxAvyY=; b=Yxrt66BCvEOhsGM2M2IeCOLuPH6ksJ6jSNXtFs2jlrGKLYkz0sPO2ZPK9T6siI6GG6 NUrlHf9zK9fqyHPXfzG0qYmIo4kzWW4W/JoR4JFecnKGXZT42xF5PJdPOERUCtqbk0gq tsLlLFh9jwAI0noPPgc5yN5udL0TCMnCq+87/x6aMUFDg3ZH+V14i9MiTUKw7dh7pweL ZGpz8MvzEoxYXntDHzErDgKnMgLL4BFPDjEKJrma0z8UKBNDBaMSdGZjdqh9D1J5TEJZ L2JG8pXFIX6s0pEffnBhH+S7KcIWjavBDOFsp6iFzv3g/cs3gLmCcvntbjvrQHck77oi AWqg== X-Received: by 10.68.106.196 with SMTP id gw4mr23729830pbb.126.1370265527800; Mon, 03 Jun 2013 06:18:47 -0700 (PDT) Received: from localhost.localdomain ([114.250.91.233]) by mx.google.com with ESMTPSA id b7sm59063659pba.39.2013.06.03.06.18.44 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 03 Jun 2013 06:18:46 -0700 (PDT) From: Jiang Liu To: Bjorn Helgaas , "Rafael J . Wysocki" Cc: Jiang Liu , Yijing Wang , linux-pci@vger.kernel.org Subject: [PATCH] PCI, ACPI: use dev_printk() to keep messages consistent Date: Mon, 3 Jun 2013 21:16:31 +0800 Message-Id: <1370265391-18236-1-git-send-email-jiang.liu@huawei.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: -s> References: -s> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org As pointed out by Bjorn that acpi_handle_printk() generates messages like "ACPI: \_SB_.PCI0: xxxxx" and dev_printk() generates messages like "acpi PNP0A08:00: xxxx", so use dev_printk() to keep messages consistent when possible. Signed-off-by: Jiang Liu --- Hi Bjorn, Could you please help to fold this patch onto "PCI/ACPI: Use acpi_handle_print() and pr_xxx() to print messages" of branch "pci/jiang-remove-global-list"? Thanks! Gerry --- drivers/acpi/pci_root.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c index 73a934d..4a8f5b4 100644 --- a/drivers/acpi/pci_root.c +++ b/drivers/acpi/pci_root.c @@ -388,7 +388,7 @@ static int acpi_pci_root_add(struct acpi_device *device, status = acpi_evaluate_integer(handle, METHOD_NAME__SEG, NULL, &segment); if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) { - acpi_handle_err(handle, "can't evaluate _SEG\n"); + dev_err(&device->dev, "can't evaluate _SEG\n"); result = -ENODEV; goto end; } @@ -404,8 +404,8 @@ static int acpi_pci_root_add(struct acpi_device *device, * can do is assume [_BBN-0xFF] or [0-0xFF]. */ root->secondary.end = 0xFF; - acpi_handle_warn(handle, - FW_BUG "no secondary bus range in _CRS\n"); + dev_warn(&device->dev, + FW_BUG "no secondary bus range in _CRS\n"); status = acpi_evaluate_integer(handle, METHOD_NAME__BBN, NULL, &bus); if (ACPI_SUCCESS(status)) @@ -413,7 +413,7 @@ static int acpi_pci_root_add(struct acpi_device *device, else if (status == AE_NOT_FOUND) root->secondary.start = 0; else { - acpi_handle_err(handle, "can't evaluate _BBN\n"); + dev_err(&device->dev, "can't evaluate _BBN\n"); result = -ENODEV; goto end; } @@ -451,9 +451,9 @@ static int acpi_pci_root_add(struct acpi_device *device, */ root->bus = pci_acpi_scan_root(root); if (!root->bus) { - acpi_handle_err(handle, - "Bus %04x:%02x not present in PCI namespace\n", - root->segment, (unsigned int)root->secondary.start); + dev_err(&device->dev, + "Bus %04x:%02x not present in PCI namespace\n", + root->segment, (unsigned int)root->secondary.start); result = -ENODEV; goto end; } @@ -511,8 +511,8 @@ static int acpi_pci_root_add(struct acpi_device *device, "ACPI _OSC request failed (%s), " "returned control mask: 0x%02x\n", acpi_format_exception(status), flags); - acpi_handle_info(handle, - "ACPI _OSC control for PCIe not granted, disabling ASPM\n"); + dev_info(&device->dev, + "ACPI _OSC control for PCIe not granted, disabling ASPM\n"); pcie_no_aspm(); } } else {