diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-03-27 11:32:29 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-03-27 11:32:29 -0300 |
commit | 50953e0640b3473dcb409d5d0d938c2742c93b0d (patch) | |
tree | 3b0dc374e61564fbbd8adff92c8fae16fdeb423a /drivers/staging/crystalhd/crystalhd_misc.h | |
parent | f92c97c8bd77992ff8bd6ef29a23dc82dca799cb (diff) | |
parent | 626cf236608505d376e4799adb4f7eb00a8594af (diff) | |
download | op-kernel-dev-50953e0640b3473dcb409d5d0d938c2742c93b0d.zip op-kernel-dev-50953e0640b3473dcb409d5d0d938c2742c93b0d.tar.gz |
Merge branch 'poll' into staging/for_v3.4
* poll: (5970 commits)
poll: add poll_requested_events() and poll_does_not_wait() functions
crc32: select an algorithm via Kconfig
crc32: add self-test code for crc32c
crypto: crc32c should use library implementation
crc32: bolt on crc32c
crc32: add note about this patchset to crc32.c
crc32: optimize loop counter for x86
crc32: add slice-by-8 algorithm to existing code
crc32: make CRC_*_BITS definition correspond to actual bit counts
crc32: fix mixing of endian-specific types
crc32: miscellaneous cleanups
crc32: simplify unit test code
crc32: move long comment about crc32 fundamentals to Documentation/
crc32: remove two instances of trailing whitespaces
checkpatch: check for quoted strings broken across lines
checkpatch: whitespace - add/remove blank lines
checkpatch: warn on use of yield()
checkpatch: add --strict tests for braces, comments and casts
checkpatch: add [] to type extensions
checkpatch: high precedence operators do not require additional parentheses in #defines
...
Diffstat (limited to 'drivers/staging/crystalhd/crystalhd_misc.h')
-rw-r--r-- | drivers/staging/crystalhd/crystalhd_misc.h | 34 |
1 files changed, 13 insertions, 21 deletions
diff --git a/drivers/staging/crystalhd/crystalhd_misc.h b/drivers/staging/crystalhd/crystalhd_misc.h index 4d61723..84c8793 100644 --- a/drivers/staging/crystalhd/crystalhd_misc.h +++ b/drivers/staging/crystalhd/crystalhd_misc.h @@ -28,6 +28,8 @@ #ifndef _CRYSTALHD_MISC_H_ #define _CRYSTALHD_MISC_H_ +#include "crystalhd.h" + #include <linux/module.h> #include <linux/kernel.h> #include <linux/errno.h> @@ -35,8 +37,6 @@ #include <linux/ioctl.h> #include <linux/dma-mapping.h> #include <linux/sched.h> -#include <asm/system.h> -#include "bc_dts_glob_lnx.h" /* Global log level variable defined in crystal_misc.c file */ extern uint32_t g_linklog_level; @@ -200,29 +200,21 @@ enum _chd_log_levels { BCMLOG_INFO = 0x00000001, /* Generic informational */ BCMLOG_DBG = 0x00000002, /* First level Debug info */ BCMLOG_SSTEP = 0x00000004, /* Stepping information */ - BCMLOG_ENTER_LEAVE = 0x00000008, /* stack tracking */ }; -#define BCMLOG_ENTER \ -if (g_linklog_level & BCMLOG_ENTER_LEAVE) { \ - printk(KERN_DEBUG "Entered %s\n", __func__); \ -} -#define BCMLOG_LEAVE \ -if (g_linklog_level & BCMLOG_ENTER_LEAVE) { \ - printk(KERN_DEBUG "Leaving %s\n", __func__); \ -} +#define BCMLOG(trace, fmt, args...) \ +do { \ + if (g_linklog_level & trace) \ + printk(fmt, ##args); \ +} while (0) -#define BCMLOG(trace, fmt, args...) \ -if (g_linklog_level & trace) { \ - printk(fmt, ##args); \ -} -#define BCMLOG_ERR(fmt, args...) \ -do { \ - if (g_linklog_level & BCMLOG_ERROR) { \ - printk(KERN_ERR "*ERR*:%s:%d: "fmt, __FILE__, __LINE__, ##args); \ - } \ -} while (0); +#define BCMLOG_ERR(fmt, args...) \ +do { \ + if (g_linklog_level & BCMLOG_ERROR) \ + printk(KERN_ERR "*ERR*:%s:%d: "fmt, \ + __FILE__, __LINE__, ##args); \ +} while (0) #endif |