From nobody Fri Dec 27 17:06:19 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YKX2h0dnwz5j3N8; Fri, 27 Dec 2024 17:06:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YKX2g5BCMz4vPM; Fri, 27 Dec 2024 17:06:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735319179; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WoDrjISXZF98ftZeGnh/8MdxSTsPDnTwnZYWjoe5z/c=; b=IUeQSsqHI9Q1+5gFi2Fs7BysBtNWgf5l1RM21dPge8vPQbyTn1zs2q6VGOIWm6xF7UC4b9 06gq20oUv5IiMSFnd/adUoEOc8Bp6SwrnQQzUMhuOyVtOMBtUrtYsea3t/5VAA22+UOi2p 96JFlg22KOWKUE0FDA0ujIw5fuK6ErlVAGvHxoHaZIsRBciTSsh9YbKrhsh0Ifp3Jr6t4z ONg/jQZoaQd0ByKTmnsCNKH0KmDsKmxGxNo2FGZPU3Igmm5JE7b7OZGWLSJmoaJbVJpcmO rfpsMY2ubJ4SYWS3VNTPgTk822/6LMDDkVRXgZ7ryKquX/qK0B1X7pvzxnAWTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735319179; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WoDrjISXZF98ftZeGnh/8MdxSTsPDnTwnZYWjoe5z/c=; b=jRrzsbG5KZuxo5JTuns21UPCzlkDyfS648W8olrtQie3KP+T69GBhP9g1uzGF9xVIM2RIY pzKZhaDlLffL1kaKrV0PKXqeqD7JxKQmKSuoO3GLOvhNBHpahNN1BTh5j5hOcHnLh9nxWV NtxNAcd7dYuJ0zXMDihoQP9nuuvGUMyz9Hwj1lBUmu7af2nsNLuZGFRsD0NL5s1egYH9PG 2R7He6odMOZXWhcebunpBMMANH5DlPs7JiO5/CSa84xOStJs6Z4McbKEnSQ90DNZT6itul CMXUduDe8ezAMQlE3S6ClkYCypnmbtIc9Y0JmtTzE6OuObswd04uTE5uwtndJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735319179; a=rsa-sha256; cv=none; b=k21/1NwBGEYB+Tow23yyFUhhJ+wQS2HJjG7W2TUnoSYLg30QPJw7/Vj5CZ5lmYa/DimiyD bAKu0iZYtNtIjq/y7CGcKCuyqsOckdTTVes2aZuSY56RPjUtfqonC5rtuYSm8rR/vm2Wod G7f6TjRRHSB1XmdMOxi1Wyai9VEtOWstxx1kYbV1lZXX/eqQkNLTQP21fza6rN25T4lmHt Pm+Lruveflx+8mwmOq0PguoDFwpDorTXEJsjOtGRnjaKYWd42Q9QdSZMxTg7ri5iFITCck zEZUcHWdMrKcOEDdvh5Zdv6NQQoWT46vwDvHlF/huu0nbUvJ+a8HSsSbQn7WMA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YKX2g4TTkznhb; Fri, 27 Dec 2024 17:06:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BRH6Jp8037103; Fri, 27 Dec 2024 17:06:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BRH6Jvh037100; Fri, 27 Dec 2024 17:06:19 GMT (envelope-from git) Date: Fri, 27 Dec 2024 17:06:19 GMT Message-Id: <202412271706.4BRH6Jvh037100@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: e34dce0f7be4 - stable/14 - pci_user.c: Cosmetic fixes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e34dce0f7be4cfb39c369ec1cf1fa6145f02e5ac Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=e34dce0f7be4cfb39c369ec1cf1fa6145f02e5ac commit e34dce0f7be4cfb39c369ec1cf1fa6145f02e5ac Author: John Baldwin AuthorDate: 2024-11-13 16:07:03 +0000 Commit: John Baldwin CommitDate: 2024-12-27 15:29:23 +0000 pci_user.c: Cosmetic fixes Correct leading whitespace for a few lines. Consistently use more canonical #ifdef to test for COMPAT_FREEBSD32. Obtained from: CheriBSD Sponsored by: AFRL, DARPA (cherry picked from commit 727de621c5f07681034eed2d6ce3662a8239e987) --- sys/dev/pci/pci_user.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/sys/dev/pci/pci_user.c b/sys/dev/pci/pci_user.c index cdb893efa950..a81044ff3c43 100644 --- a/sys/dev/pci/pci_user.c +++ b/sys/dev/pci/pci_user.c @@ -692,7 +692,7 @@ pci_conf_size(u_long cmd) static void pci_conf_io_init(struct pci_conf_io *cio, caddr_t data, u_long cmd) { -#if defined(COMPAT_FREEBSD32) +#ifdef COMPAT_FREEBSD32 struct pci_conf_io32 *cio32; #endif @@ -709,17 +709,17 @@ pci_conf_io_init(struct pci_conf_io *cio, caddr_t data, u_long cmd) #ifdef PRE7_COMPAT case PCIOCGETCONF_OLD32: #endif - cio32 = (struct pci_conf_io32 *)data; - cio->pat_buf_len = cio32->pat_buf_len; - cio->num_patterns = cio32->num_patterns; - cio->patterns = (void *)(uintptr_t)cio32->patterns; - cio->match_buf_len = cio32->match_buf_len; - cio->num_matches = cio32->num_matches; - cio->matches = (void *)(uintptr_t)cio32->matches; - cio->offset = cio32->offset; - cio->generation = cio32->generation; - cio->status = cio32->status; - return; + cio32 = (struct pci_conf_io32 *)data; + cio->pat_buf_len = cio32->pat_buf_len; + cio->num_patterns = cio32->num_patterns; + cio->patterns = (void *)(uintptr_t)cio32->patterns; + cio->match_buf_len = cio32->match_buf_len; + cio->num_matches = cio32->num_matches; + cio->matches = (void *)(uintptr_t)cio32->matches; + cio->offset = cio32->offset; + cio->generation = cio32->generation; + cio->status = cio32->status; + return; #endif default: @@ -733,7 +733,7 @@ pci_conf_io_update_data(const struct pci_conf_io *cio, caddr_t data, u_long cmd) { struct pci_conf_io *d_cio; -#if defined(COMPAT_FREEBSD32) +#ifdef COMPAT_FREEBSD32 struct pci_conf_io32 *cio32; #endif @@ -1172,7 +1172,7 @@ pci_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag, struct thread *t */ cio->status = PCI_GETCONF_ERROR; error = EINVAL; - goto getconfexit; + goto getconfexit; } /*