The branch main has been updated by bz:
URL:
https://cgit.FreeBSD.org/src/commit/?id=70617458676eb0b0076aa19657d21f2a9f3b704a
commit 70617458676eb0b0076aa19657d21f2a9f3b704a
Author: Bjoern A. Zeeb <b...@freebsd.org>
AuthorDate: 2024-02-01 23:56:45 +0000
Commit: Bjoern A. Zeeb <b...@freebsd.org>
CommitDate: 2024-02-14 22:05:21 +0000
LinuxKPI: sort dev_<loglevel>() functions
Sort the dev_<loglevel> functions by loglevel order, add the dev_alert()
version and an indentation change.
No functional changes.
MFC after: 3 days
Reviewed by: emaste
Differential Revision: https://reviews.freebsd.org/D43719
---
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 142003c5ca8c..b4cd97931672 100644
--- a/sys/compat/linuxkpi/common/include/linux/device.h
+++ b/sys/compat/linuxkpi/common/include/linux/device.h
@@ -188,15 +188,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__)
