2011-09-26 09:01:13

by Rajkumar Manoharan

Subject: [PATCH] ath6kl: Fix compilation error while compiling w/o debug

drivers/net/wireless/ath/ath6kl/htc_hif.o:
In function `ath6kl_debug_fwlog_event':
drivers/net/wireless/ath/ath6kl/debug.h:109:
multiple definition of `ath6kl_debug_fwlog_event'
drivers/net/wireless/ath/ath6kl/debug.o:
drivers/net/wireless/ath/ath6kl/debug.h:109: first defined here
drivers/net/wireless/ath/ath6kl/htc_hif.o:
In function `ath6kl_debug_cleanup':
drivers/net/wireless/ath/ath6kl/debug.h:118:
multiple definition of `ath6kl_debug_cleanup'
drivers/net/wireless/ath/ath6kl/debug.o:
drivers/net/wireless/ath/ath6kl/debug.h:118: first defined here

Signed-off-by: Rajkumar Manoharan <[email protected]>
---
drivers/net/wireless/ath/ath6kl/debug.h | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/ath/ath6kl/debug.h b/drivers/net/wireless/ath/ath6kl/debug.h
index f0d6471..89bf8e1 100644
--- a/drivers/net/wireless/ath/ath6kl/debug.h
+++ b/drivers/net/wireless/ath/ath6kl/debug.h
@@ -105,7 +105,8 @@ static inline void dump_cred_dist_stats(struct htc_target *target)
{
}

-void ath6kl_debug_fwlog_event(struct ath6kl *ar, const void *buf, size_t len)
+static inline void ath6kl_debug_fwlog_event(struct ath6kl *ar,
+ const void *buf, size_t len)
{
}

@@ -114,7 +115,7 @@ static inline int ath6kl_debug_init(struct ath6kl *ar)
return 0;
}

-void ath6kl_debug_cleanup(struct ath6kl *ar)
+static inline void ath6kl_debug_cleanup(struct ath6kl *ar)
{
}

--
1.7.6.4

2011-09-27 07:17:24

by Kalle Valo

Subject: Re: [PATCH] ath6kl: Fix compilation error while compiling w/o debug

On 09/26/2011 11:59 AM, Rajkumar Manoharan wrote:
> drivers/net/wireless/ath/ath6kl/htc_hif.o:
> In function `ath6kl_debug_fwlog_event':
> drivers/net/wireless/ath/ath6kl/debug.h:109:
> multiple definition of `ath6kl_debug_fwlog_event'
> drivers/net/wireless/ath/ath6kl/debug.o:
> drivers/net/wireless/ath/ath6kl/debug.h:109: first defined here
> drivers/net/wireless/ath/ath6kl/htc_hif.o:
> In function `ath6kl_debug_cleanup':
> drivers/net/wireless/ath/ath6kl/debug.h:118:
> multiple definition of `ath6kl_debug_cleanup'
> drivers/net/wireless/ath/ath6kl/debug.o:
> drivers/net/wireless/ath/ath6kl/debug.h:118: first defined here

I broke this, thank you for fixing it. Patch applied.

Kalle