* [PATCH] brcmfmac: fix BRCMF_FW_NVRAM_DEF macro for older gcc compilers
@ 2016-01-16 15:39 Arend van Spriel
2016-01-18 8:14 ` Kalle Valo
0 siblings, 1 reply; 6+ messages in thread
From: Arend van Spriel @ 2016-01-16 15:39 UTC (permalink / raw)
To: Kalle Valo; +Cc: linux-wireless, Arend van Spriel
With gcc < 4.3 __UNIQUE_ID does not create unique ids with the macro
BRCMF_FW_NVRAM_DEF. Fix this by removing the MODULE_FIRMWARE instance
for the nvram file. This file is not in linux-firmware repo so it may
not be needed anyway. Otherwise consider this as a temporary fix.
Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Arend van Spriel <aspriel@gmail.com>
---
Hi Kalle,
Here a quick fix for the __UNIQUE_ID issue. Looking at the other
issue right now, which seems a bit more complicated.
Regards,
Arend
---
drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h
index ef06f57..d3c9f0d 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h
@@ -47,8 +47,7 @@ static const char BRCM_ ## fw_nvram_name ## _FIRMWARE_NAME[] = \
BRCMF_FW_DEFAULT_PATH fw; \
static const char BRCM_ ## fw_nvram_name ## _NVRAM_NAME[] = \
BRCMF_FW_DEFAULT_PATH nvram; \
-MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH fw); \
-MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH nvram)
+MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH fw);
#define BRCMF_FW_DEF(fw_name, fw) \
static const char BRCM_ ## fw_name ## _FIRMWARE_NAME[] = \
--
1.9.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] brcmfmac: fix BRCMF_FW_NVRAM_DEF macro for older gcc compilers
2016-01-16 15:39 [PATCH] brcmfmac: fix BRCMF_FW_NVRAM_DEF macro for older gcc compilers Arend van Spriel
@ 2016-01-18 8:14 ` Kalle Valo
2016-01-18 9:08 ` Geert Uytterhoeven
2016-01-18 16:21 ` David Miller
0 siblings, 2 replies; 6+ messages in thread
From: Kalle Valo @ 2016-01-18 8:14 UTC (permalink / raw)
To: Arend van Spriel; +Cc: linux-wireless, Geert Uytterhoeven, David Miller
Arend van Spriel <aspriel@gmail.com> writes:
> With gcc < 4.3 __UNIQUE_ID does not create unique ids with the macro
> BRCMF_FW_NVRAM_DEF. Fix this by removing the MODULE_FIRMWARE instance
> for the nvram file. This file is not in linux-firmware repo so it may
> not be needed anyway. Otherwise consider this as a temporary fix.
>
> Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
> Signed-off-by: Arend van Spriel <aspriel@gmail.com>
Thanks. Geert, it would be great if you could test this.
Dave, if Geert says the patch is ok do you mind taking this directly? I
would like to fix this build breakage quickly.
https://patchwork.kernel.org/patch/8049181/
Acked-by: Kalle Valo <kvalo@codeaurora.org>
--
Kalle Valo
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] brcmfmac: fix BRCMF_FW_NVRAM_DEF macro for older gcc compilers
2016-01-18 8:14 ` Kalle Valo
@ 2016-01-18 9:08 ` Geert Uytterhoeven
2016-01-18 9:27 ` Geert Uytterhoeven
2016-01-18 16:21 ` David Miller
1 sibling, 1 reply; 6+ messages in thread
From: Geert Uytterhoeven @ 2016-01-18 9:08 UTC (permalink / raw)
To: Kalle Valo; +Cc: Arend van Spriel, linux-wireless, David Miller
On Mon, Jan 18, 2016 at 9:14 AM, Kalle Valo <kvalo@codeaurora.org> wrote:
> Arend van Spriel <aspriel@gmail.com> writes:
>
>> With gcc < 4.3 __UNIQUE_ID does not create unique ids with the macro
>> BRCMF_FW_NVRAM_DEF. Fix this by removing the MODULE_FIRMWARE instance
>> for the nvram file. This file is not in linux-firmware repo so it may
>> not be needed anyway. Otherwise consider this as a temporary fix.
>>
>> Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
>> Signed-off-by: Arend van Spriel <aspriel@gmail.com>
>
> Thanks. Geert, it would be great if you could test this.
Thanks, this fixes this build failure, so
Tested-by: Geert Uytterhoeven <geert@linux-m68k.org>
(unfortunately) now up to the next one...
> Dave, if Geert says the patch is ok do you mind taking this directly? I
> would like to fix this build breakage quickly.
>
> https://patchwork.kernel.org/patch/8049181/
>
> Acked-by: Kalle Valo <kvalo@codeaurora.org>
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] brcmfmac: fix BRCMF_FW_NVRAM_DEF macro for older gcc compilers
2016-01-18 9:08 ` Geert Uytterhoeven
@ 2016-01-18 9:27 ` Geert Uytterhoeven
2016-01-18 9:36 ` Arend van Spriel
0 siblings, 1 reply; 6+ messages in thread
From: Geert Uytterhoeven @ 2016-01-18 9:27 UTC (permalink / raw)
To: Kalle Valo; +Cc: Arend van Spriel, linux-wireless, David Miller
On Mon, Jan 18, 2016 at 10:08 AM, Geert Uytterhoeven
<geert@linux-m68k.org> wrote:
> (unfortunately) now up to the next one...
Please ignore. I used
"make drivers/net/wireless/broadcom/brcm80211/brcmfmac/", which didn't pick up
subdir-ccflags-$(CONFIG_BRCMDBG) += -DDEBUG
in drivers/net/wireless/broadcom/brcm80211/Makefile
It builds fine with doing a normal build.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] brcmfmac: fix BRCMF_FW_NVRAM_DEF macro for older gcc compilers
2016-01-18 9:27 ` Geert Uytterhoeven
@ 2016-01-18 9:36 ` Arend van Spriel
0 siblings, 0 replies; 6+ messages in thread
From: Arend van Spriel @ 2016-01-18 9:36 UTC (permalink / raw)
To: Geert Uytterhoeven, Kalle Valo
Cc: Arend van Spriel, linux-wireless, David Miller
On 18-1-2016 10:27, Geert Uytterhoeven wrote:
> On Mon, Jan 18, 2016 at 10:08 AM, Geert Uytterhoeven
> <geert@linux-m68k.org> wrote:
>> (unfortunately) now up to the next one...
>
> Please ignore. I used
> "make drivers/net/wireless/broadcom/brcm80211/brcmfmac/", which didn't pick up
>
> subdir-ccflags-$(CONFIG_BRCMDBG) += -DDEBUG
>
> in drivers/net/wireless/broadcom/brcm80211/Makefile
>
> It builds fine with doing a normal build.
I see. Was not sure whether "next one" meant "brcmfmac" or not.
Regards,
Arend
> Gr{oetje,eeting}s,
>
> Geert
>
> --
> Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
>
> In personal conversations with technical people, I call myself a hacker. But
> when I'm talking to journalists I just say "programmer" or something like that.
> -- Linus Torvalds
> --
> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] brcmfmac: fix BRCMF_FW_NVRAM_DEF macro for older gcc compilers
2016-01-18 8:14 ` Kalle Valo
2016-01-18 9:08 ` Geert Uytterhoeven
@ 2016-01-18 16:21 ` David Miller
1 sibling, 0 replies; 6+ messages in thread
From: David Miller @ 2016-01-18 16:21 UTC (permalink / raw)
To: kvalo; +Cc: aspriel, linux-wireless, geert
From: Kalle Valo <kvalo@codeaurora.org>
Date: Mon, 18 Jan 2016 10:14:27 +0200
> Arend van Spriel <aspriel@gmail.com> writes:
>
>> With gcc < 4.3 __UNIQUE_ID does not create unique ids with the macro
>> BRCMF_FW_NVRAM_DEF. Fix this by removing the MODULE_FIRMWARE instance
>> for the nvram file. This file is not in linux-firmware repo so it may
>> not be needed anyway. Otherwise consider this as a temporary fix.
>>
>> Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
>> Signed-off-by: Arend van Spriel <aspriel@gmail.com>
>
> Thanks. Geert, it would be great if you could test this.
>
> Dave, if Geert says the patch is ok do you mind taking this directly? I
> would like to fix this build breakage quickly.
>
> https://patchwork.kernel.org/patch/8049181/
>
> Acked-by: Kalle Valo <kvalo@codeaurora.org>
Ok, applied, thanks.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-01-18 16:21 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-01-16 15:39 [PATCH] brcmfmac: fix BRCMF_FW_NVRAM_DEF macro for older gcc compilers Arend van Spriel
2016-01-18 8:14 ` Kalle Valo
2016-01-18 9:08 ` Geert Uytterhoeven
2016-01-18 9:27 ` Geert Uytterhoeven
2016-01-18 9:36 ` Arend van Spriel
2016-01-18 16:21 ` David Miller
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).