From nobody Sun Feb 18 21:11:00 2024 X-Original-To: dev-commits-src-branches@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 4TdJHS3R08z5BmLN; Sun, 18 Feb 2024 21:11:00 +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 4TdJHS2T3fz41XP; Sun, 18 Feb 2024 21:11:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708290660; 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=YTtfTVepCELHXXGGvlnxJBenI1cjLzcl0Qy/sxQpXyU=; b=TrPVVpf70H449at0uBLEMo/5XnwowSwkoq3AqxH3eZMWvEc1mK7w3JyKLPlOAbMlIDyQC2 xNvfzfKm0MSCLTw8fFGxBh7RC2prH+cTCd3xrjTSR09lwMw4O3oqONJpuasFg2vwlUdTM9 lfLm8pIp21x1wEUTk9pW5VnLNNSje9NzRozr9/vCl7vTZ84mPGg+c/Vqh7ETAJFbTzrDn7 TuKZQ0aehncvgz3meVLoKer2+D1x4ZQ5rNcE0aY9T/Wb1frm4K49Kj0d2MCViWEsHaUVYx mp3McR58hIETTukB5hsJBbL8Wl0F5j80RUWwWegiZUd9WcxCvH20Jp5pBjiCkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708290660; 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=YTtfTVepCELHXXGGvlnxJBenI1cjLzcl0Qy/sxQpXyU=; b=kLFx8WVbcUbP4T/kpO3zPijYNNhQ1aZdQRgsB23fwjPuDqXAbb8rW1reLmsF/JiYwiNsdq cQn85gChkcEQKLOSGIxjyqchSf91wxaNRFrMI1WAY4/eghJP19vYic6TAF+oviXgduxJG0 qKxID/FKk/pBjZ6dqoIMMCHGgZ1HY+g81hlNpbz7TJW/Wkjc2Z+Eyj52eog0GRxS/SNsCH tj/1MZF0GSIAki/PRcZdKABdAKD7oSpWDPiln/ZsTc11xm8bGibKsaftMyXl1ux4YksNtK mpDwrEEl+Vbv3d0LeGLTSf5tLBTMjaupqjc1tqm00Fd8tNFuNnKsp3lq3jTfxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708290660; a=rsa-sha256; cv=none; b=FVU/FUoQcoMgSJa6RMu0Ne+DZBW0wkcI87iSR/t+QPDZUpS4r49qJBCJ6JVRxSsGqZ8FZh 1PoSH7Uj/542YQbD44h7arGbETJgXGKNy0AaqfSbok1PYkFUEGK+y26iiwu5SYgZ52dqAZ UynPKEtb6k2XnXTmHVtCjEv7c/5r5ja2IB+dusX4+ugH3u/JjvVSkz6/2PqedMdAszoquV r8GsHUhbMy136aFPvlCzRClN0QbmR0o3Wa/tDCu+IPR/pmvnX+aOwPH+4G5JFY5Yx0dtaW n5+MENlPynNQyYg60QyYq4t7/YC9nj2qeBXzGbBj+IJTF3/1qJdhCVSIvw8hyw== 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 4TdJHS1YWdz16Kn; Sun, 18 Feb 2024 21:11:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41ILB0a7012462; Sun, 18 Feb 2024 21:11:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41ILB0PX012459; Sun, 18 Feb 2024 21:11:00 GMT (envelope-from git) Date: Sun, 18 Feb 2024 21:11:00 GMT Message-Id: <202402182111.41ILB0PX012459@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 55baa8265ad5 - stable/14 - LinuxKPI: sort dev_() functions List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 55baa8265ad567cf5ac49e119311caca8f3862ed Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=55baa8265ad567cf5ac49e119311caca8f3862ed commit 55baa8265ad567cf5ac49e119311caca8f3862ed Author: Bjoern A. Zeeb AuthorDate: 2024-02-01 23:56:45 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-02-18 16:41:06 +0000 LinuxKPI: sort dev_() functions Sort the dev_ functions by loglevel order, add the dev_alert() version and an indentation change. No functional changes. Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D43719 (cherry picked from commit 70617458676eb0b0076aa19657d21f2a9f3b704a) --- sys/compat/linuxkpi/common/include/linux/device.h | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/device.h b/sys/compat/linuxkpi/common/include/linux/device.h index 2135d365460b..7e5b1423311b 100644 --- a/sys/compat/linuxkpi/common/include/linux/device.h +++ b/sys/compat/linuxkpi/common/include/linux/device.h @@ -187,15 +187,17 @@ show_class_attr_string(struct class *class, struct class_attribute_string class_attr_##_name = \ _CLASS_ATTR_STRING(_name, _mode, _str) -#define dev_err(dev, fmt, ...) device_printf((dev)->bsddev, fmt, ##__VA_ARGS__) -#define dev_crit(dev, fmt, ...) device_printf((dev)->bsddev, fmt, ##__VA_ARGS__) -#define dev_warn(dev, fmt, ...) device_printf((dev)->bsddev, fmt, ##__VA_ARGS__) -#define dev_info(dev, fmt, ...) device_printf((dev)->bsddev, fmt, ##__VA_ARGS__) -#define dev_notice(dev, fmt, ...) device_printf((dev)->bsddev, fmt, ##__VA_ARGS__) -#define dev_emerg(dev, fmt, ...) device_printf((dev)->bsddev, fmt, ##__VA_ARGS__) -#define dev_dbg(dev, fmt, ...) do { } while (0) #define dev_printk(lvl, dev, fmt, ...) \ - device_printf((dev)->bsddev, fmt, ##__VA_ARGS__) + device_printf((dev)->bsddev, fmt, ##__VA_ARGS__) + +#define dev_emerg(dev, fmt, ...) device_printf((dev)->bsddev, fmt, ##__VA_ARGS__) +#define dev_alert(dev, fmt, ...) device_printf((dev)->bsddev, fmt, ##__VA_ARGS__) +#define dev_crit(dev, fmt, ...) device_printf((dev)->bsddev, fmt, ##__VA_ARGS__) +#define dev_err(dev, fmt, ...) device_printf((dev)->bsddev, fmt, ##__VA_ARGS__) +#define dev_warn(dev, fmt, ...) device_printf((dev)->bsddev, fmt, ##__VA_ARGS__) +#define dev_notice(dev, fmt, ...) device_printf((dev)->bsddev, fmt, ##__VA_ARGS__) +#define dev_info(dev, fmt, ...) device_printf((dev)->bsddev, fmt, ##__VA_ARGS__) +#define dev_dbg(dev, fmt, ...) do { } while (0) #define dev_WARN(dev, fmt, ...) \ device_printf((dev)->bsddev, "%s:%d: " fmt, __func__, __LINE__, ##__VA_ARGS__)