2012-03-15 07:44:47

by Vivek Natarajan

Subject: [PATCH 1/2] cfg80211: Fix a compilation warning

Fix a macro redefined warning:

net/wireless/reg.c:45:1 warning: "pr_fmt" redefined

Also remove an unused instance in core.c

Signed-off-by: Vivek Natarajan <[email protected]>
---
net/wireless/core.c | 2 --
net/wireless/reg.c | 2 ++
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/wireless/core.c b/net/wireless/core.c
index ccdfed8..067c008 100644
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -4,8 +4,6 @@
* Copyright 2006-2010 Johannes Berg <[email protected]>
*/

-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
#include <linux/if.h>
#include <linux/module.h>
#include <linux/err.h>
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index e9a0ac8..1797fcc 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -42,7 +42,9 @@
*
*/

+#ifndef pr_fmt
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+#endif

#include <linux/kernel.h>
#include <linux/export.h>
--
1.7.0.4

2012-03-15 08:47:15

by Vivek Natarajan

Subject: Re: [PATCH 1/2] cfg80211: Fix a compilation warning

On Thu, Mar 15, 2012 at 1:33 PM, Johannes Berg
<[email protected]> wrote:
> On Thu, 2012-03-15 at 13:14 +0530, Vivek Natarajan wrote:
>> Fix a macro redefined warning:
>>
>> net/wireless/reg.c:45:1 warning: "pr_fmt" redefined
>>
>> Also remove an unused instance in core.c
>>
>> Signed-off-by: Vivek Natarajan <[email protected]>
>> ---
>> ?net/wireless/core.c | ? ?2 --
>> ?net/wireless/reg.c ?| ? ?2 ++
>> ?2 files changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/net/wireless/core.c b/net/wireless/core.c
>> index ccdfed8..067c008 100644
>> --- a/net/wireless/core.c
>> +++ b/net/wireless/core.c
>> @@ -4,8 +4,6 @@
>> ? * Copyright 2006-2010 ? ? ? ? ? ? ? Johannes Berg <[email protected]>
>> ? */
>>
>> -#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
>> -
>> ?#include <linux/if.h>
>> ?#include <linux/module.h>
>> ?#include <linux/err.h>
>> diff --git a/net/wireless/reg.c b/net/wireless/reg.c
>> index e9a0ac8..1797fcc 100644
>> --- a/net/wireless/reg.c
>> +++ b/net/wireless/reg.c
>> @@ -42,7 +42,9 @@
>> ? *
>> ? */
>>
>> +#ifndef pr_fmt
>> ?#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
>> +#endif
>
> Umm, no? This isn't right -- are you getting this warning while building
> a compat tree?

Yes, on compiling it with compat-wireless.

Vivek.

2012-03-15 08:03:38

by Johannes Berg

Subject: Re: [PATCH 1/2] cfg80211: Fix a compilation warning

On Thu, 2012-03-15 at 13:14 +0530, Vivek Natarajan wrote:
> Fix a macro redefined warning:
>
> net/wireless/reg.c:45:1 warning: "pr_fmt" redefined
>
> Also remove an unused instance in core.c
>
> Signed-off-by: Vivek Natarajan <[email protected]>
> ---
> net/wireless/core.c | 2 --
> net/wireless/reg.c | 2 ++
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/net/wireless/core.c b/net/wireless/core.c
> index ccdfed8..067c008 100644
> --- a/net/wireless/core.c
> +++ b/net/wireless/core.c
> @@ -4,8 +4,6 @@
> * Copyright 2006-2010 Johannes Berg <[email protected]>
> */
>
> -#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
> -
> #include <linux/if.h>
> #include <linux/module.h>
> #include <linux/err.h>
> diff --git a/net/wireless/reg.c b/net/wireless/reg.c
> index e9a0ac8..1797fcc 100644
> --- a/net/wireless/reg.c
> +++ b/net/wireless/reg.c
> @@ -42,7 +42,9 @@
> *
> */
>
> +#ifndef pr_fmt
> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
> +#endif

Umm, no? This isn't right -- are you getting this warning while building
a compat tree?

johannes