diff options
| author | Benjamin Romer | 2015-03-04 18:14:23 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2015-03-07 01:48:44 +0100 |
| commit | 1a84fec17106f03100aa7f41c96b78f9c0b6531b (patch) | |
| tree | b15129e7ff49cbb80312412ad47e5e1ba9e62835 /drivers/staging | |
| parent | staging: unisys: remove LOGINF macros (diff) | |
| download | kernel-qcow2-linux-1a84fec17106f03100aa7f41c96b78f9c0b6531b.tar.gz kernel-qcow2-linux-1a84fec17106f03100aa7f41c96b78f9c0b6531b.tar.xz kernel-qcow2-linux-1a84fec17106f03100aa7f41c96b78f9c0b6531b.zip | |
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>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/unisys/include/timskmod.h | 9 | ||||
| -rw-r--r-- | drivers/staging/unisys/visorutil/periodic_work.c | 2 |
2 files changed, 1 insertions, 10 deletions
diff --git a/drivers/staging/unisys/include/timskmod.h b/drivers/staging/unisys/include/timskmod.h index ff0fc167413c..667eae6b9477 100644 --- a/drivers/staging/unisys/include/timskmod.h +++ b/drivers/staging/unisys/include/timskmod.h @@ -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)) diff --git a/drivers/staging/unisys/visorutil/periodic_work.c b/drivers/staging/unisys/visorutil/periodic_work.c index 0908bf929401..411fd1ea0784 100644 --- a/drivers/staging/unisys/visorutil/periodic_work.c +++ b/drivers/staging/unisys/visorutil/periodic_work.c @@ -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: |