* Compile problem in ath9k with ATH_DBG_WARN_ON_ONCE @ 2010-12-09 13:47 Hauke Mehrtens 2010-12-09 14:12 ` [PATCH] ath: fix build break " John W. Linville 0 siblings, 1 reply; 4+ messages in thread From: Hauke Mehrtens @ 2010-12-09 13:47 UTC (permalink / raw) To: Luis R. Rodriguez, Ben Greear; +Cc: linux-wireless@vger.kernel.org Hi, I got an compile problem in drivers/net/wireless/ath/ath9k/main.c This is caused by commit ff9f0b639f33c92a89b0799263ab625444be6ee1 ath9k: skip ATH9K_INT_TIM_TIMER when we are idle and d7fd1b50a51be3fe6554fbab8953fa8a3ff4009b ath9k: Make DMA warning in ath_stoprecv WARN_ON_ONCE. If CONFIG_ATH_DEBUG=y is set ATH_DBG_WARN_ON_ONCE uses WARN_ON_ONCE and returns something, but if CONFIG_ATH_DEBUG is not set it does not return anything. Now ATH_DBG_WARN_ON_ONCE is used in the boolean expression in an if case and is not returning anything and causes a compile error. CC [M] /drivers/net/wireless/ath/ath9k/main.o /drivers/net/wireless/ath/ath9k/main.c: In function ‘ath_isr’: /drivers/net/wireless/ath/ath9k/main.c:769: error: expected expression before ‘do’ make[5]: *** [/drivers/net/wireless/ath/ath9k/main.o] Error 1 make[4]: *** [/drivers/net/wireless/ath/ath9k] Error 2 Hauke ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] ath: fix build break with ATH_DBG_WARN_ON_ONCE 2010-12-09 13:47 Compile problem in ath9k with ATH_DBG_WARN_ON_ONCE Hauke Mehrtens @ 2010-12-09 14:12 ` John W. Linville 2010-12-09 14:17 ` Johannes Berg 0 siblings, 1 reply; 4+ messages in thread From: John W. Linville @ 2010-12-09 14:12 UTC (permalink / raw) To: linux-wireless Cc: Hauke Mehrtens, Luis R. Rodriguez, Ben Greear, John W. Linville Description by Hauke: "If CONFIG_ATH_DEBUG=y is set ATH_DBG_WARN_ON_ONCE uses WARN_ON_ONCE and returns something, but if CONFIG_ATH_DEBUG is not set it does not return anything. Now ATH_DBG_WARN_ON_ONCE is used in the boolean expression in an if case and is not returning anything and causes a compile error. CC [M] /drivers/net/wireless/ath/ath9k/main.o /drivers/net/wireless/ath/ath9k/main.c: In function ‘ath_isr’: /drivers/net/wireless/ath/ath9k/main.c:769: error: expected expression before ‘do’ make[5]: *** [/drivers/net/wireless/ath/ath9k/main.o] Error 1 make[4]: *** [/drivers/net/wireless/ath/ath9k] Error 2" Reported-by: Hauke Mehrtens <hauke@hauke-m.de> Signed-off-by: John W. Linville <linville@tuxdriver.com> --- drivers/net/wireless/ath/ath.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/net/wireless/ath/ath.h b/drivers/net/wireless/ath/ath.h index 3eb95e2..45d4d91 100644 --- a/drivers/net/wireless/ath/ath.h +++ b/drivers/net/wireless/ath/ath.h @@ -272,7 +272,7 @@ ath_dbg(struct ath_common *common, enum ATH_DEBUG dbg_mask, return 0; } #define ATH_DBG_WARN(foo, arg...) do {} while (0) -#define ATH_DBG_WARN_ON_ONCE(foo) do {} while (0) +#define ATH_DBG_WARN_ON_ONCE(foo) ({ 0; }) #endif /* CONFIG_ATH_DEBUG */ -- 1.7.3.2 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] ath: fix build break with ATH_DBG_WARN_ON_ONCE 2010-12-09 14:12 ` [PATCH] ath: fix build break " John W. Linville @ 2010-12-09 14:17 ` Johannes Berg 2010-12-09 14:42 ` John W. Linville 0 siblings, 1 reply; 4+ messages in thread From: Johannes Berg @ 2010-12-09 14:17 UTC (permalink / raw) To: John W. Linville Cc: linux-wireless, Hauke Mehrtens, Luis R. Rodriguez, Ben Greear On Thu, 2010-12-09 at 09:12 -0500, John W. Linville wrote: > diff --git a/drivers/net/wireless/ath/ath.h b/drivers/net/wireless/ath/ath.h > index 3eb95e2..45d4d91 100644 > --- a/drivers/net/wireless/ath/ath.h > +++ b/drivers/net/wireless/ath/ath.h > @@ -272,7 +272,7 @@ ath_dbg(struct ath_common *common, enum ATH_DEBUG dbg_mask, > return 0; > } > #define ATH_DBG_WARN(foo, arg...) do {} while (0) > -#define ATH_DBG_WARN_ON_ONCE(foo) do {} while (0) > +#define ATH_DBG_WARN_ON_ONCE(foo) ({ 0; }) That'll fix the build error, but wouldn't you need (foo) for correctness instead? johannes ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] ath: fix build break with ATH_DBG_WARN_ON_ONCE 2010-12-09 14:17 ` Johannes Berg @ 2010-12-09 14:42 ` John W. Linville 0 siblings, 0 replies; 4+ messages in thread From: John W. Linville @ 2010-12-09 14:42 UTC (permalink / raw) To: Johannes Berg Cc: linux-wireless, Hauke Mehrtens, Luis R. Rodriguez, Ben Greear On Thu, Dec 09, 2010 at 03:17:52PM +0100, Johannes Berg wrote: > On Thu, 2010-12-09 at 09:12 -0500, John W. Linville wrote: > > > diff --git a/drivers/net/wireless/ath/ath.h b/drivers/net/wireless/ath/ath.h > > index 3eb95e2..45d4d91 100644 > > --- a/drivers/net/wireless/ath/ath.h > > +++ b/drivers/net/wireless/ath/ath.h > > @@ -272,7 +272,7 @@ ath_dbg(struct ath_common *common, enum ATH_DEBUG dbg_mask, > > return 0; > > } > > #define ATH_DBG_WARN(foo, arg...) do {} while (0) > > -#define ATH_DBG_WARN_ON_ONCE(foo) do {} while (0) > > +#define ATH_DBG_WARN_ON_ONCE(foo) ({ 0; }) > > That'll fix the build error, but wouldn't you need (foo) for correctness > instead? Well, true -- that was too simple. Unfortunately (foo) gives warnings when the return code is not checked. John --- >From b7613370db5ba66ad81e41cd3a5417fde4d5e03c Mon Sep 17 00:00:00 2001 From: John W. Linville <linville@tuxdriver.com> Date: Thu, 9 Dec 2010 09:08:47 -0500 Subject: [PATCH] ath: fix build break with ATH_DBG_WARN_ON_ONCE MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Description by Hauke: "If CONFIG_ATH_DEBUG=y is set ATH_DBG_WARN_ON_ONCE uses WARN_ON_ONCE and returns something, but if CONFIG_ATH_DEBUG is not set it does not return anything. Now ATH_DBG_WARN_ON_ONCE is used in the boolean expression in an if case and is not returning anything and causes a compile error. CC [M] /drivers/net/wireless/ath/ath9k/main.o /drivers/net/wireless/ath/ath9k/main.c: In function ‘ath_isr’: /drivers/net/wireless/ath/ath9k/main.c:769: error: expected expression before ‘do’ make[5]: *** [/drivers/net/wireless/ath/ath9k/main.o] Error 1 make[4]: *** [/drivers/net/wireless/ath/ath9k] Error 2" Reported-by: Hauke Mehrtens <hauke@hauke-m.de> Signed-off-by: John W. Linville <linville@tuxdriver.com> --- drivers/net/wireless/ath/ath.h | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/drivers/net/wireless/ath/ath.h b/drivers/net/wireless/ath/ath.h index 3eb95e2..e43210c 100644 --- a/drivers/net/wireless/ath/ath.h +++ b/drivers/net/wireless/ath/ath.h @@ -272,7 +272,10 @@ ath_dbg(struct ath_common *common, enum ATH_DEBUG dbg_mask, return 0; } #define ATH_DBG_WARN(foo, arg...) do {} while (0) -#define ATH_DBG_WARN_ON_ONCE(foo) do {} while (0) +#define ATH_DBG_WARN_ON_ONCE(foo) ({ \ + int __ret_warn_once = !!(foo); \ + unlikely(__ret_warn_once); \ +}) #endif /* CONFIG_ATH_DEBUG */ -- 1.7.3.2 -- John W. Linville Someday the world will need a hero, and you linville@tuxdriver.com might be all we have. Be ready. ^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-12-09 14:45 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2010-12-09 13:47 Compile problem in ath9k with ATH_DBG_WARN_ON_ONCE Hauke Mehrtens 2010-12-09 14:12 ` [PATCH] ath: fix build break " John W. Linville 2010-12-09 14:17 ` Johannes Berg 2010-12-09 14:42 ` John W. Linville
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).