From patchwork Wed Jan 29 18:18:03 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 3553831 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 84C7A9F382 for ; Wed, 29 Jan 2014 18:24:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B272F201B4 for ; Wed, 29 Jan 2014 18:24:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 36EA6201B9 for ; Wed, 29 Jan 2014 18:24:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753097AbaA2SSJ (ORCPT ); Wed, 29 Jan 2014 13:18:09 -0500 Received: from mail-ie0-f171.google.com ([209.85.223.171]:52625 "EHLO mail-ie0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753081AbaA2SSG (ORCPT ); Wed, 29 Jan 2014 13:18:06 -0500 Received: by mail-ie0-f171.google.com with SMTP id as1so2475982iec.30 for ; Wed, 29 Jan 2014 10:18:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=subject:to:from:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-type:content-transfer-encoding; bh=CTGkUdvICCCUlBlOZKCnDlZ675UHw+kSF61yg6xOWG4=; b=ehlnVlC3+W58hwUiPX2XlNYzlmubzC4Bs/r6ZMXWCMdal+gQh7u+kAt9oXm6DoDN89 rmNVzteVHxxed+A7PjJ61L3CRtykCtFlT9/zPRXQw4xnkhKt3POUIwP0+OG+K+uqoL/4 wnI9JDguczvIMUeTj+NHjIN6/kQ00ak0uh+j61WeNVAey8xV9BMhGS/zLSBAeKRmSCbX WbWLLf4ENCoje9lbYaQK6YpGm6WUtAp9HJX5FRwbwnCJGk/YiLhALLHH3qVRXTu6Cysl pFyDWJ0B5hFlOKpgXZ6rNQr9VhhEMVLWrpwgiueOmnaiR/G6/B54D2RiO+PSEKHjqW5F uksQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:to:from:cc:date:message-id:in-reply-to :references:user-agent:mime-version:content-type :content-transfer-encoding; bh=CTGkUdvICCCUlBlOZKCnDlZ675UHw+kSF61yg6xOWG4=; b=HFRUYjTdJR9/0AA6Ox064kVN2jlSrMbWRciox4zJsLPihFChEwqTToEmdzoX3On4pC pJyPVPn+oya5dqKhWOew1VHLRI5JXZ5xPxN2dbzBAcdIAisk3p1Z4mKdcY3/+waXpEby IuorVIrddVypzJrM6DSVN1unybzhe8Cl62WRRU+UCD3j02+9qBi3CnMq9lwiKchYGCaT u8YVDneOSBOKHItkDwBMW8mJO+4rmlsT+oezyqWmj0B//E4Mpubm/+Nbw/k5qW9oUuTH 3M/xCewiX2NXmaINiBD5K7E+6CBQA++OZDBSfOE8yYtBdeVmBdWwFfvA4lzBYDWlRO9g ez1g== X-Gm-Message-State: ALoCoQnsMS6ST5y/7SwLJvNXWiIEPV/4o2RKMrsQCzTKz2NS3Cq8ddY8xfz5QTv9EbfqL8WZKf478MoYCj92Aw0TCfwfYOGEKpQSBFciJ4RH036TXXJ7lrRUAzPSASw5PUvg1+xBonb1K/NpBEQE5dmq+AFZF3pwaGw0rz8Nh9l4q3SEOEu6YbQqwGeJW9B5cwgS5AFtxyPdLIKIpc9BDE3jIXUk+sNUsg== X-Received: by 10.50.30.166 with SMTP id t6mr10085273igh.7.1391019486015; Wed, 29 Jan 2014 10:18:06 -0800 (PST) Received: from localhost ([172.29.123.160]) by mx.google.com with ESMTPSA id ft2sm11168843igb.5.2014.01.29.10.18.04 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 29 Jan 2014 10:18:04 -0800 (PST) Subject: [PATCH 05/17] x86/PCI: Drop return value of pcibios_scan_root() To: linux-pci@vger.kernel.org From: Bjorn Helgaas Cc: linux-acpi@vger.kernel.org, x86@kernel.org, linux-ia64@vger.kernel.org, linux-kernel@vger.kernel.org Date: Wed, 29 Jan 2014 11:18:03 -0700 Message-ID: <20140129181803.15476.65726.stgit@bhelgaas-glaptop.roam.corp.google.com> In-Reply-To: <20140129174106.15476.7075.stgit@bhelgaas-glaptop.roam.corp.google.com> References: <20140129174106.15476.7075.stgit@bhelgaas-glaptop.roam.corp.google.com> User-Agent: StGit/0.16 MIME-Version: 1.0 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Nobody really uses the return value of pcibios_scan_root() (one place uses it to control a printk, but the printk is not very useful). This converts pcibios_scan_root() to a void function. Signed-off-by: Bjorn Helgaas --- arch/x86/include/asm/pci.h | 2 +- arch/x86/pci/common.c | 6 ++---- arch/x86/pci/irq.c | 4 +--- 3 files changed, 4 insertions(+), 8 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 diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h index b52f9c0ec5fb..96ae4f4040bb 100644 --- a/arch/x86/include/asm/pci.h +++ b/arch/x86/include/asm/pci.h @@ -65,7 +65,7 @@ extern unsigned long pci_mem_start; extern int pcibios_enabled; void pcibios_config_init(void); -struct pci_bus *pcibios_scan_root(int bus); +void pcibios_scan_root(int bus); void pcibios_set_master(struct pci_dev *dev); void pcibios_penalize_isa_irq(int irq, int active); diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c index 52ad00c2e198..600e5925f1a4 100644 --- a/arch/x86/pci/common.c +++ b/arch/x86/pci/common.c @@ -456,7 +456,7 @@ void __init dmi_check_pciprobe(void) dmi_check_system(pciprobe_dmi_table); } -struct pci_bus *pcibios_scan_root(int busnum) +void pcibios_scan_root(int busnum) { struct pci_bus *bus; struct pci_sysdata *sd; @@ -465,7 +465,7 @@ struct pci_bus *pcibios_scan_root(int busnum) sd = kzalloc(sizeof(*sd), GFP_KERNEL); if (!sd) { printk(KERN_ERR "PCI: OOM, skipping PCI bus %02x\n", busnum); - return NULL; + return; } sd->node = get_mp_bus_to_node(busnum); x86_pci_root_bus_resources(busnum, &resources); @@ -475,8 +475,6 @@ struct pci_bus *pcibios_scan_root(int busnum) pci_free_resource_list(&resources); kfree(sd); } - - return bus; } void __init pcibios_set_cache_line_size(void) diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c index 8658874165c2..84112f55dd7a 100644 --- a/arch/x86/pci/irq.c +++ b/arch/x86/pci/irq.c @@ -138,9 +138,7 @@ static void __init pirq_peer_trick(void) for (i = 1; i < 256; i++) { if (!busmap[i] || pci_find_bus(0, i)) continue; - if (pcibios_scan_root(i)) - printk(KERN_INFO "PCI: Discovered primary peer " - "bus %02x [IRQ]\n", i); + pcibios_scan_root(i); } pcibios_last_bus = -1; }