openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: unisys: remove ASSERT() macro 

Remove the ASSERT macro from timskmod.h, and replace its single use with
WARN_ON() instead.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Benjamin Romer 2015-03-04 12:14:23 -05:00 committed by Greg Kroah-Hartman
parent 2098dbd1b2
commit 1a84fec171
2 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/staging/unisys/include/timskmod.h
View File

@ -68,15 +68,6 @@
#define HOSTADDRESS unsigned long long
#endif
/** Try to evaulate the provided expression, and do a RETINT(x) iff
* the expression evaluates to < 0.
*/
#define ASSERT(cond) \
do { if (!(cond)) \
HUHDRV("ASSERT failed - %s", \
__stringify(cond)); \
} while (0)
#define sizeofmember(TYPE, MEMBER) (sizeof(((TYPE *)0)->MEMBER))
/** "Covered quotient" function */
#define COVQ(v, d) (((v) + (d) - 1) / (d))

2
drivers/staging/unisys/visorutil/periodic_work.c
View File

@ -182,7 +182,7 @@ BOOL visor_periodic_work_stop(struct periodic_work *pw)
/* We get here if the delayed work was pending as
* delayed work, but was NOT run.
*/
ASSERT(pw->is_scheduled);
WARN_ON(!pw->is_scheduled);
pw->is_scheduled = FALSE;
} else {
/* If we get here, either the delayed work: