d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

upgrade the warning printf-s in bus accessors to KASSERT-s, take 2

Browse Source 
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:
Andriy Gapon 2019-07-01 06:22:41 +00:00
parent 23cfb1b256
commit 3e7bae0821
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sys/sys/bus.h
View File

@ -152,6 +152,7 @@ struct devreq {
#include <sys/_eventhandler.h> #include <sys/_eventhandler.h>
#include <sys/kobj.h> #include <sys/kobj.h>
#include <sys/systm.h>
/** /**
* devctl hooks. Typically one should use the devctl_notify * devctl hooks. Typically one should use the devctl_notify
@ -813,12 +814,9 @@ static __inline type varp ## _get_ ## var(device_t dev) \
int e; \ int e; \
e = BUS_READ_IVAR(device_get_parent(dev), dev, \ e = BUS_READ_IVAR(device_get_parent(dev), dev, \
ivarp ## _IVAR_ ## ivar, &v); \ ivarp ## _IVAR_ ## ivar, &v); \
if (e != 0) { \ KASSERT(e == 0, ("%s failed for %s on bus %s, error = %d", \
device_printf(dev, "failed to read ivar " \ __func__, device_get_nameunit(dev), \
__XSTRING(ivarp ## _IVAR_ ## ivar) " on bus %s, " \ device_get_nameunit(device_get_parent(dev)), e)); \
"error = %d\n", \
device_get_nameunit(device_get_parent(dev)), e); \
} \
return ((type) v); \ return ((type) v); \
} \ } \
\ \
@ -828,12 +826,9 @@ static __inline void varp ## _set_ ## var(device_t dev, type t) \
int e; \ int e; \
e = BUS_WRITE_IVAR(device_get_parent(dev), dev, \ e = BUS_WRITE_IVAR(device_get_parent(dev), dev, \
ivarp ## _IVAR_ ## ivar, v); \ ivarp ## _IVAR_ ## ivar, v); \
if (e != 0) { \ KASSERT(e == 0, ("%s failed for %s on bus %s, error = %d", \
device_printf(dev, "failed to write ivar " \ __func__, device_get_nameunit(dev), \
__XSTRING(ivarp ## _IVAR_ ## ivar) " on bus %s, " \ device_get_nameunit(device_get_parent(dev)), e)); \
"error = %d\n", \
device_get_nameunit(device_get_parent(dev)), e); \
} \
} }
/** /**