From patchwork Wed Jan 29 18:18:41 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 3553731 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@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 352929F382 for ; Wed, 29 Jan 2014 18:22:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6BABA201B9 for ; Wed, 29 Jan 2014 18:22:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 119B1200E7 for ; Wed, 29 Jan 2014 18:22:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753255AbaA2SSt (ORCPT ); Wed, 29 Jan 2014 13:18:49 -0500 Received: from mail-ie0-f169.google.com ([209.85.223.169]:43297 "EHLO mail-ie0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753257AbaA2SSn (ORCPT ); Wed, 29 Jan 2014 13:18:43 -0500 Received: by mail-ie0-f169.google.com with SMTP id to1so2452035ieb.0 for ; Wed, 29 Jan 2014 10:18:43 -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=XqZbipblvZohr6xOx50WXTxqQl4J4R4rllXD1A544zE=; b=Qx1Z/xQjONDEm+tvOZvZyu9NvBzm/ndWIxoOt0TZcxj86DozXFoYnGw5e2mkpksp3C yFZPfUvS9PayyLpPRJgXL8G2UxvnyPyicIwZDmSe8CqER23+FP2wQ5/ZgB3U2IOzmha0 g7yathJ0mnGTguCRHiyHM1k7Y5zaAU20NnunKGNwkrfmBtJdT5o1bO6eYKvW9RVObu5Z vpARTPplInsxYkfTqI9rjhR4Kb5DJR/IpJ09Zq2bmDnxYbI1gD4EUDeyXkvKVwA1G+Ae BAhw3Ole6E4OPxilTSO0TgbXUNA9/gF/w8h0Plsc4q1ZlRVYiT5IxBDUa5cWBy7uWslD OLJw== 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=XqZbipblvZohr6xOx50WXTxqQl4J4R4rllXD1A544zE=; b=TGKEH1VLIrv43tRGNEiHJXktoxUhTwrAAxpLoohmPlsbBRgB3YK9OZFIWOOdbiM5iW RHypGbn4Kctfjv3bzt+h2cDmtoLx4H5NEYAEAg3Be16gTP2IUcc0jzFFIXvsv7vglf/9 zeRi5DO5x/5hzSQaEHSH2h4ZGc3t19ran0Bv90sOLsoO1GPk3a08QmJi30NtvRcQEQxB 7olx0ZV2pdbVHCB1B9hgLxfSldTec4fYdcZvj+1JtNf7XZtUubOchPO4g3ZjZe13wR+k qRGZ0FD902wmaLOLX+Tg+Ulgy+dKinwBlEdC/QiFe+QRTNcki1c7h7uVwJ63BkziuNc7 h+Ug== X-Gm-Message-State: ALoCoQkTIadmBNVB94fQ61GGxgRQ+QFZ4fLvW00XZEgJOgE8ku66MS1BeJ7G0vIMw3cS6W7VSAvhK97J7f5eNEKh8ALzh+kIss1tTyS2x3gH6B9Buxi9VNQGhBTRE5qjg4afL8d09kUMjgtroqY/YbUoTF1+1Rd6KIqUhpA5vu4YDwwqPlAl1lQr7+cmv0K6MU46u5r7O/QHK2iPFf+amyqI0/Lu0kLtJ1h2WguKi1BESKEDRXdk4SE= X-Received: by 10.50.87.201 with SMTP id ba9mr9854122igb.21.1391019523130; Wed, 29 Jan 2014 10:18:43 -0800 (PST) Received: from localhost ([172.29.123.160]) by mx.google.com with ESMTPSA id kt2sm78891448igb.1.2014.01.29.10.18.41 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 29 Jan 2014 10:18:42 -0800 (PST) Subject: [PATCH 10/17] x86/PCI: Use NUMA_NO_NODE, not -1, for unknown node 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:41 -0700 Message-ID: <20140129181841.15476.36375.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-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@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=ham 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 NUMA_NO_NODE is the usual value for "we don't know what node this is on," e.g., it is the error return from acpi_get_node(). This changes uses of -1 to NUMA_NO_NODE. NUMA_NO_NODE is #defined to be -1 already, so this is not a functional change. Signed-off-by: Bjorn Helgaas --- arch/x86/pci/acpi.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-pci" 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/pci/acpi.c b/arch/x86/pci/acpi.c index 78f27efa11e1..6304ea0f426d 100644 --- a/arch/x86/pci/acpi.c +++ b/arch/x86/pci/acpi.c @@ -494,17 +494,17 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root) return NULL; } - node = -1; + node = NUMA_NO_NODE; #ifdef CONFIG_ACPI_NUMA pxm = acpi_get_pxm(device->handle); if (pxm >= 0) node = pxm_to_node(pxm); #endif - if (node == -1) + if (node == NUMA_NO_NODE) node = x86_pci_root_bus_node(busnum); - if (node != -1 && !node_online(node)) - node = -1; + if (node != NUMA_NO_NODE && !node_online(node)) + node = NUMA_NO_NODE; info = kzalloc(sizeof(*info), GFP_KERNEL); if (!info) { @@ -570,7 +570,7 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root) pcie_bus_configure_settings(child); } - if (bus && node != -1) { + if (bus && node != NUMA_NO_NODE) { #ifdef CONFIG_ACPI_NUMA if (pxm >= 0) dev_printk(KERN_DEBUG, &bus->dev,