From nobody Mon Nov 14 20:09:40 2022 X-Original-To: dev-commits-src-main@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 4NB0lS4v2Qz4dDBX; Mon, 14 Nov 2022 20:09:40 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NB0lS4CdDz3MBZ; Mon, 14 Nov 2022 20:09:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668456580; 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=vjeAhcgtHQerYc0U2nNVyiElgzHkKIO++JTtZDh39zA=; b=EzqYHGlyhQg1VRB36G3NL7K8If8DGPQr7WNBwJL2P9b85/M7Jn0usu6GW8lDlVZ+PARyRw FdYioNB1jWXtzNZVhhpoKUPUX3m/eQ24UknKokd6ZBz03XM9aD2FhbIVt9nx1n2nqZKeUc vweJxS2LGsBfv7TCLulFPW9SAWlmECu+bVmOIszvtSItdGmMgSJvm/Yg/GUjWdRUZ8qMoa Crw0+M+F0LIcltgngbXTRM+VJkR14kfPOAA/viM9s4N0//48NG3vNQvYRerDV5GjSvsMS+ B0vIjRCexQz3YSSXc5HMVrxBoQTKhxfWube9j3MrNrA9ErLrWmFem9KwNx4zHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668456580; 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=vjeAhcgtHQerYc0U2nNVyiElgzHkKIO++JTtZDh39zA=; b=PevO+DtYPlUxc+D3JU0TJXrHG8bBK13A35MxLlTmpPxyNeZ7RADNT38L/7Sw+oD/c7B7ba Hh42+p/wno7t3XawRCR3avQKBq8z2PzqOo36vS2kpla4c1Kxp41beenS3qdRVND1jSt18p IL99+svzDrDHpv/A9G4jtQnKIxd6ZciToVdcee/szhsS2dbLh44SCy4J0VyqbQGCp3ilch y2iyzM6DUHgakZ1a711kfqY/dLm/RwyjDuh4KPRjiTapx9oaLyeXU8C9PtTKZZE7iqygnK OpqTHAoLK2ZaAbYTgVBX9CVnGPFQgahVe95FRD5BkCOZxmJ33BLE9doeCEbsVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668456580; a=rsa-sha256; cv=none; b=FEuUD5z2C6soqfKmdDCU8u3tPwSTp0/INBWnjrGZjaXYUaggrfBqkgYVLAJSBkpmZS7e9T NU9fSl2ux9JO3GahuxyGVMSJaY7dhWTCcxnTHVj8GYKl3T20jyWSuah/8d/deGu2DPzTBF Aqj5KKj4vaSYjpytxxgNMNZXfyj6qFUh2pelMXxQEdi7crWJT7FYyPxWVbN92xa8LkI1/d RikrNRmSbENfT0ed41MdVpZr5ShTDP98/YGMRMiOrd6ddv8CDCboI/aTEk4J3LwYpM+mwM iVwRi1kW6RazBBbVXD8aRvxBjtFi0H4Dr5pre5xJnCPafpGaeJMMI2UO74/x+w== 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 4NB0lS31wBzvTK; Mon, 14 Nov 2022 20:09:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2AEK9elM081444; Mon, 14 Nov 2022 20:09:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AEK9eOB081443; Mon, 14 Nov 2022 20:09:40 GMT (envelope-from git) Date: Mon, 14 Nov 2022 20:09:40 GMT Message-Id: <202211142009.2AEK9eOB081443@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: db494ceb65ef - main - virtio: Silence a -Wunused warning List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: db494ceb65ef301c8fb48f57b60c4f7a9cfebba5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=db494ceb65ef301c8fb48f57b60c4f7a9cfebba5 commit db494ceb65ef301c8fb48f57b60c4f7a9cfebba5 Author: Mark Johnston AuthorDate: 2022-11-14 20:07:34 +0000 Commit: Mark Johnston CommitDate: 2022-11-14 20:07:34 +0000 virtio: Silence a -Wunused warning Remove virtio_swap_endian(). htole*() are nops on little-endian platforms. No functional change intended. MFC after: 1 week Reviewed by: corvink, jhb Differential Revision: https://reviews.freebsd.org/D37298 --- sys/dev/virtio/virtio_endian.h | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/sys/dev/virtio/virtio_endian.h b/sys/dev/virtio/virtio_endian.h index 19d7fcc12079..5c9bc7ec8f79 100644 --- a/sys/dev/virtio/virtio_endian.h +++ b/sys/dev/virtio/virtio_endian.h @@ -42,20 +42,10 @@ * and the Host's (device's) endianness when needed. */ -static inline bool -virtio_swap_endian(bool modern) -{ -#if _BYTE_ORDER == _LITTLE_ENDIAN - return (false); -#else - return (modern); -#endif -} - static inline uint16_t virtio_htog16(bool modern, uint16_t val) { - if (virtio_swap_endian(modern)) + if (modern) return (le16toh(val)); else return (val); @@ -64,7 +54,7 @@ virtio_htog16(bool modern, uint16_t val) static inline uint16_t virtio_gtoh16(bool modern, uint16_t val) { - if (virtio_swap_endian(modern)) + if (modern) return (htole16(val)); else return (val); @@ -73,7 +63,7 @@ virtio_gtoh16(bool modern, uint16_t val) static inline uint32_t virtio_htog32(bool modern, uint32_t val) { - if (virtio_swap_endian(modern)) + if (modern) return (le32toh(val)); else return (val); @@ -82,7 +72,7 @@ virtio_htog32(bool modern, uint32_t val) static inline uint32_t virtio_gtoh32(bool modern, uint32_t val) { - if (virtio_swap_endian(modern)) + if (modern) return (htole32(val)); else return (val); @@ -91,7 +81,7 @@ virtio_gtoh32(bool modern, uint32_t val) static inline uint64_t virtio_htog64(bool modern, uint64_t val) { - if (virtio_swap_endian(modern)) + if (modern) return (le64toh(val)); else return (val); @@ -100,7 +90,7 @@ virtio_htog64(bool modern, uint64_t val) static inline uint64_t virtio_gtoh64(bool modern, uint64_t val) { - if (virtio_swap_endian(modern)) + if (modern) return (htole64(val)); else return (val);