aboutsummaryrefslogtreecommitdiff
path: root/sys/sys/bus.h
diff options
context:
space:
mode:
authorAndriy Gapon <avg@FreeBSD.org>2019-06-27 15:07:06 +0000
committerAndriy Gapon <avg@FreeBSD.org>2019-06-27 15:07:06 +0000
commitd55fcc487ef1439858894ed039f92de4c54ed86c (patch)
treee91caa1a62b327b134b69cac34dd520fcba543a5 /sys/sys/bus.h
parentd05fa0d94959e354c6f028826bc540787791d6af (diff)
downloadsrc-d55fcc487ef1439858894ed039f92de4c54ed86c.tar.gz
src-d55fcc487ef1439858894ed039f92de4c54ed86c.zip
upgrade the warning printf-s in bus accessors to KASSERT-s
After this change sys/bus.h includes sys/systm.h. Discussed with: cem, imp MFC after: 2 weeks
Notes
Notes: svn path=/head/; revision=349459
Diffstat (limited to 'sys/sys/bus.h')
-rw-r--r--sys/sys/bus.h19
1 files changed, 7 insertions, 12 deletions
diff --git a/sys/sys/bus.h b/sys/sys/bus.h
index 9fb4a6d4c38e..915d6bc886db 100644
--- a/sys/sys/bus.h
+++ b/sys/sys/bus.h
@@ -35,6 +35,7 @@
#include <machine/_bus.h>
#include <sys/_bus_dma.h>
#include <sys/ioccom.h>
+#include <sys/systm.h>
/**
* @defgroup NEWBUS newbus - a generic framework for managing devices
@@ -813,12 +814,9 @@ static __inline type varp ## _get_ ## var(device_t dev) \
int e; \
e = BUS_READ_IVAR(device_get_parent(dev), dev, \
ivarp ## _IVAR_ ## ivar, &v); \
- if (e != 0) { \
- device_printf(dev, "failed to read ivar " \
- __XSTRING(ivarp ## _IVAR_ ## ivar) " on bus %s, " \
- "error = %d\n", \
- device_get_nameunit(device_get_parent(dev)), e); \
- } \
+ KASSERT(e == 0, ("%s failed for %s on bus %s, error = %d", \
+ __func__, device_get_nameunit(dev), \
+ device_get_nameunit(device_get_parent(dev)), e)); \
return ((type) v); \
} \
\
@@ -828,12 +826,9 @@ static __inline void varp ## _set_ ## var(device_t dev, type t) \
int e; \
e = BUS_WRITE_IVAR(device_get_parent(dev), dev, \
ivarp ## _IVAR_ ## ivar, v); \
- if (e != 0) { \
- device_printf(dev, "failed to write ivar " \
- __XSTRING(ivarp ## _IVAR_ ## ivar) " on bus %s, " \
- "error = %d\n", \
- device_get_nameunit(device_get_parent(dev)), e); \
- } \
+ KASSERT(e == 0, ("%s failed for %s on bus %s, error = %d", \
+ __func__, device_get_nameunit(dev), \
+ device_get_nameunit(device_get_parent(dev)), e)); \
}
/**