From owner-svn-src-stable-11@freebsd.org Wed Sep 13 11:07:13 2017 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6272AE1ABFA; Wed, 13 Sep 2017 11:07:13 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2EE0B83491; Wed, 13 Sep 2017 11:07:13 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8DB7CtU072228; Wed, 13 Sep 2017 11:07:12 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8DB7COV072227; Wed, 13 Sep 2017 11:07:12 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201709131107.v8DB7COV072227@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Wed, 13 Sep 2017 11:07:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r323536 - stable/11/sys/x86/pci X-SVN-Group: stable-11 X-SVN-Commit-Author: kib X-SVN-Commit-Paths: stable/11/sys/x86/pci X-SVN-Commit-Revision: 323536 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Sep 2017 11:07:13 -0000 Author: kib Date: Wed Sep 13 11:07:12 2017 New Revision: 323536 URL: https://svnweb.freebsd.org/changeset/base/323536 Log: MFC r323217: Fix typos. Stop claiming that two children are created. MFC r323310: Consistently use tabs for indent. Modified: stable/11/sys/x86/pci/qpi.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/x86/pci/qpi.c ============================================================================== --- stable/11/sys/x86/pci/qpi.c Wed Sep 13 10:59:36 2017 (r323535) +++ stable/11/sys/x86/pci/qpi.c Wed Sep 13 11:07:12 2017 (r323536) @@ -26,9 +26,9 @@ */ /* - * This driver provides a psuedo-bus to enumerate the PCI buses - * present on a sytem using a QPI chipset. It creates a qpi0 bus that - * is a child of nexus0 and then creates two Host-PCI bridges as a + * This driver provides a pseudo-bus to enumerate the PCI buses + * present on a system using a QPI chipset. It creates a qpi0 bus that + * is a child of nexus0 and then creates Host-PCI bridges as a * child of that. */ @@ -64,15 +64,15 @@ static void qpi_identify(driver_t *driver, device_t parent) { - /* Check CPUID to ensure this is an i7 CPU of some sort. */ - if (!(cpu_vendor_id == CPU_VENDOR_INTEL && + /* Check CPUID to ensure this is an i7 CPU of some sort. */ + if (!(cpu_vendor_id == CPU_VENDOR_INTEL && CPUID_TO_FAMILY(cpu_id) == 0x6 && (CPUID_TO_MODEL(cpu_id) == 0x1a || CPUID_TO_MODEL(cpu_id) == 0x2c))) - return; + return; - /* PCI config register access is required. */ - if (pci_cfgregopen() == 0) - return; + /* PCI config register access is required. */ + if (pci_cfgregopen() == 0) + return; /* Add a qpi bus device. */ if (BUS_ADD_CHILD(parent, 20, "qpi", -1) == NULL) @@ -219,7 +219,7 @@ qpi_pcib_attach(device_t dev) { device_add_child(dev, "pci", -1); - return (bus_generic_attach(dev)); + return (bus_generic_attach(dev)); } static int