From: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
Date: Sat, 12 Feb 2011 18:43:51 +0000 (+0200)
Subject: zd1211rw: add unlikely to ZD_ASSERT
X-Git-Tag: v2.6.39-rc1~468^2~25^2^2~190
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=91f71fa5da00ff50398d8592f304cfec54eed550;p=platform%2Fkernel%2Flinux-3.10.git

zd1211rw: add unlikely to ZD_ASSERT

Case assert is violated should be quite unlikely.

Signed-off-by: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/drivers/net/wireless/zd1211rw/zd_def.h b/drivers/net/wireless/zd1211rw/zd_def.h
index 6ac597f..5463ca9 100644
--- a/drivers/net/wireless/zd1211rw/zd_def.h
+++ b/drivers/net/wireless/zd1211rw/zd_def.h
@@ -45,7 +45,7 @@ typedef u16 __nocast zd_addr_t;
 #ifdef DEBUG
 #  define ZD_ASSERT(x) \
 do { \
-	if (!(x)) { \
+	if (unlikely(!(x))) { \
 		pr_debug("%s:%d ASSERT %s VIOLATED!\n", \
 			__FILE__, __LINE__, __stringify(x)); \
 		dump_stack(); \