mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-16 10:20:30 +00:00
upgrade the warning printf-s in bus accessors to KASSERT-s, take 2
After this change sys/bus.h includes sys/systm.h when _KERNEL is defined. This brings back r349459 but with systm.h hidden from userland. MFC after: 2 weeks
This commit is contained in:
parent
23cfb1b256
commit
3e7bae0821
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=349571
@ -152,6 +152,7 @@ struct devreq {
|
||||
|
||||
#include <sys/_eventhandler.h>
|
||||
#include <sys/kobj.h>
|
||||
#include <sys/systm.h>
|
||||
|
||||
/**
|
||||
* devctl hooks. Typically one should use the devctl_notify
|
||||
@ -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)); \
|
||||
}
|
||||
|
||||
/**
|
||||
|
Loading…
Reference in New Issue
Block a user