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

revert r349460, printf -> KASSERT in bus.h, until I can fix it

Browse Source 
I tested only kernel builds naively assuming that sys/bus.h cannot
affect userland builds.

Pointyhat to:	me
This commit is contained in:
Andriy Gapon 2019-06-27 15:51:50 +00:00
parent 061b38cdcc
commit f45e9414cf
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sys/sys/bus.h
View File

@ -35,7 +35,6 @@
#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
@ -814,9 +813,12 @@ static __inline type varp ## _get_ ## var(device_t dev) \
int e; \
e = BUS_READ_IVAR(device_get_parent(dev), dev, \
ivarp ## _IVAR_ ## ivar, &v); \
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)); \
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); \
} \
return ((type) v); \
} \
\
@ -826,9 +828,12 @@ 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); \
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)); \
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); \
} \
}
/**