From nobody Wed Nov 13 17:11:29 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 4XpVDx3RT6z5cLYs; Wed, 13 Nov 2024 17:11:29 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XpVDx2yqfz56Fq; Wed, 13 Nov 2024 17:11:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731517889; 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=C2NqQN8iSIzdnZXTrqblKQaUWguvcJSFsKnDCEu7bW4=; b=vWaAhssJ/ydxGTVCEVrcTpwFMRFwUMQHIoG6KZMk1klvaZMO41t0VnCrull65IRCvxQnYv I3YnibAIZzFpWTjolCy9dQlWtUpHr94gLWuGTbv/7cGyD9g0qHwFl8l8aGKPOHUEPkr3u2 VPfHVtUVl/wFSyYJD0v7CgVYBjbLA9xZXQpyXWQREFLTuePjXQpnAZKHHKj/i42UFPGgtA J+sfGiuLfO7iRC5wlRLUaMVKXNBHrNrkjPfb6kn3UKN4T8g29nq0kBYH/WhgrIzBKv4jJO Rnnfk0ar6+IhpGZWtcQCimt4bK4GJoKDmhnoLUJbOtPDnGhPMjMqf0BI4nyMDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731517889; 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=C2NqQN8iSIzdnZXTrqblKQaUWguvcJSFsKnDCEu7bW4=; b=UWoZKZOIwyMFpiY+fukEfptLVjP8LqY5StGgnnTWkeKmUFVeo3dplUYyfD2uslsPvZczI6 yU8xGz3jyNgvTHRFnCQaSdl2CJz3GALrY8RIyf9ClHyx8Zkr8X+AAIt4G3e5GkA+lOantJ YpUosuohY+WWyhuk0MFAtexEadxkn3rkjxb1AYUZDYV4DF7v70FKA7nUWFaIq7vvaBFFnS wK6dtpO40SHw4xpi/vagThAlAsMyB+L5iKTn8hzxXPwTa+aGhViHB20jYgB/ydb/Ny0y/h AjEaYfdQ009da0NwbWXniYM0Y8n58pCgiCjeMEySGFK4b3FAa3vG181WdgzIYw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731517889; a=rsa-sha256; cv=none; b=twARxX5kwejadJuYdM26/UAH+yw8lOkZT5VgOVC3TLitAr6+zi8urG6n6NAn2mKrlIKEz7 V1v4dNxUFzAcK59eKYBra1vleGLL6CfXTMw6l94LPl6Wg6oq6J6UhKnst8+GN1hO4BvzHH esI7qNuzt2Quhhjc4wM+GtiOahm0yYTsWDF7HjnwOYn1G+FaB+PIgn0Getm/xj9S0CHNnW xrmQ/QPViQIYdWvCgXBYLBRJDo6+6MTPHkY+rnq2sFI6OAkfi5fnOI8tVmcDHx19ZgMHra ezvHMolQVSmLFPEXan+zcTPy0S0jQMD0Ig2URxRDjAhtr98wy2HN3A1W/nDFrQ== 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 4XpVDx2ZYkz13b4; Wed, 13 Nov 2024 17:11:29 +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 4ADHBTRe087296; Wed, 13 Nov 2024 17:11:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4ADHBTE9087293; Wed, 13 Nov 2024 17:11:29 GMT (envelope-from git) Date: Wed, 13 Nov 2024 17:11:29 GMT Message-Id: <202411131711.4ADHBTE9087293@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 727de621c5f0 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 727de621c5f07681034eed2d6ce3662a8239e987 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=727de621c5f07681034eed2d6ce3662a8239e987 commit 727de621c5f07681034eed2d6ce3662a8239e987 Author: John Baldwin AuthorDate: 2024-11-13 16:07:03 +0000 Commit: John Baldwin CommitDate: 2024-11-13 16:10:27 +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 --- 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 aedf3409fc6e..f68b5b7e71ff 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_FREEBSD6_32: #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; } /*