diff options
author | Bryan Thompson <bryan.thompson@unisys.com> | 2016-12-01 01:31:06 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-12-01 03:58:48 -0500 |
commit | c0e87ae270bf4714189bb3c2f87365f7fb22b0b6 (patch) | |
tree | e822a6ec369a270f2e0b3ffa715baeba56e37a27 | |
parent | c7e047768b8cac22398b0dc5e572e3482f07006b (diff) |
staging: unisys: visorbus: Use CURRENT_FILE_PC in base postcode macro
Use CURRENT_FILE_PC directly in the POSTCODE_LINUX macro instead of
relying on passthrough macros to provide it.
Signed-off-by: Bryan Thompson <bryan.thompson@unisys.com>
Signed-off-by: David Kershner <david.kershner@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/staging/unisys/visorbus/vmcallinterface.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/staging/unisys/visorbus/vmcallinterface.h b/drivers/staging/unisys/visorbus/vmcallinterface.h index ab44402ca422..b6181f98487a 100644 --- a/drivers/staging/unisys/visorbus/vmcallinterface.h +++ b/drivers/staging/unisys/visorbus/vmcallinterface.h | |||
@@ -242,10 +242,11 @@ enum event_pc { /* POSTCODE event identifier tuples */ | |||
242 | */ | 242 | */ |
243 | 243 | ||
244 | /* BASE FUNCTIONS */ | 244 | /* BASE FUNCTIONS */ |
245 | #define POSTCODE_LINUX(DRIVER_PC, EVENT_PC, pc16bit1, pc16bit2, severity) \ | 245 | #define POSTCODE_LINUX(EVENT_PC, pc16bit1, pc16bit2, severity) \ |
246 | do { \ | 246 | do { \ |
247 | unsigned long long post_code_temp; \ | 247 | unsigned long long post_code_temp; \ |
248 | post_code_temp = (((u64)DRIVER_PC) << 56) | (((u64)EVENT_PC) << 44) | \ | 248 | post_code_temp = (((u64)CURRENT_FILE_PC) << 56) | \ |
249 | (((u64)EVENT_PC) << 44) | \ | ||
249 | ((((u64)__LINE__) & 0xFFF) << 32) | \ | 250 | ((((u64)__LINE__) & 0xFFF) << 32) | \ |
250 | ((((u64)pc16bit1) & 0xFFFF) << 16) | \ | 251 | ((((u64)pc16bit1) & 0xFFFF) << 16) | \ |
251 | (((u64)pc16bit2) & 0xFFFF); \ | 252 | (((u64)pc16bit2) & 0xFFFF); \ |
@@ -254,14 +255,13 @@ do { \ | |||
254 | 255 | ||
255 | /* MOST COMMON */ | 256 | /* MOST COMMON */ |
256 | #define POSTCODE_LINUX_2(EVENT_PC, severity) \ | 257 | #define POSTCODE_LINUX_2(EVENT_PC, severity) \ |
257 | POSTCODE_LINUX(CURRENT_FILE_PC, EVENT_PC, 0, 0, severity) | 258 | POSTCODE_LINUX(EVENT_PC, 0, 0, severity) |
258 | 259 | ||
259 | #define POSTCODE_LINUX_3(EVENT_PC, pc32bit, severity) \ | 260 | #define POSTCODE_LINUX_3(EVENT_PC, pc32bit, severity) \ |
260 | POSTCODE_LINUX(CURRENT_FILE_PC, EVENT_PC, (pc32bit >> 16), \ | 261 | POSTCODE_LINUX(EVENT_PC, (pc32bit >> 16), (pc32bit & 0xFFFF), \ |
261 | (pc32bit & 0xFFFF), severity) | 262 | severity) |
262 | 263 | ||
263 | #define POSTCODE_LINUX_4(EVENT_PC, pc16bit1, pc16bit2, severity) \ | 264 | #define POSTCODE_LINUX_4(EVENT_PC, pc16bit1, pc16bit2, severity) \ |
264 | POSTCODE_LINUX(CURRENT_FILE_PC, EVENT_PC, pc16bit1, \ | 265 | POSTCODE_LINUX(EVENT_PC, pc16bit1, pc16bit2, severity) |
265 | pc16bit2, severity) | ||
266 | 266 | ||
267 | #endif /* __IOMONINTF_H__ */ | 267 | #endif /* __IOMONINTF_H__ */ |