PCI_BUS defined in defs.h results in warnings from all brcm80211 source files
including defs.h. This define is not used in brcm80211. Removing this define
fixes the warning.
In file included from drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c:35:0:
drivers/net/wireless/brcm80211/include/defs.h:23:0: warning: "PCI_BUS" redefined [enabled by default]
include/uapi/linux/pci.h:36:0: note: this is the location of the previous definition
CC [M] drivers/net/wireless/b43legacy/dma.o
CC [M] drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.o
CC [M] drivers/net/wireless/b43legacy/pio.o
In file included from drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c:29:0:
drivers/net/wireless/brcm80211/include/defs.h:23:0: warning: "PCI_BUS" redefined [enabled by default]
include/uapi/linux/pci.h:36:0: note: this is the location of the previous definition
In file included from drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c:29:0:
drivers/net/wireless/brcm80211/include/defs.h:23:0: warning: "PCI_BUS" redefined [enabled by default]
include/uapi/linux/pci.h:36:0: note: this is the location of the previous definition
Signed-off-by: Shuah Khan <[email protected]>
---
drivers/net/wireless/brcm80211/include/defs.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/net/wireless/brcm80211/include/defs.h b/drivers/net/wireless/brcm80211/include/defs.h
index fb7cbcf..3608436 100644
--- a/drivers/net/wireless/brcm80211/include/defs.h
+++ b/drivers/net/wireless/brcm80211/include/defs.h
@@ -20,7 +20,6 @@
#include <linux/types.h>
#define SI_BUS 0
-#define PCI_BUS 1
#define PCMCIA_BUS 2
#define SDIO_BUS 3
#define JTAG_BUS 4
--
1.7.9.5
On 03/04/2013 07:02 PM, Shuah Khan wrote:
> PCI_BUS defined in defs.h results in warnings from all brcm80211 source files
> including defs.h. This define is not used in brcm80211. Removing this define
> fixes the warning.
>
> In file included from drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c:35:0:
> drivers/net/wireless/brcm80211/include/defs.h:23:0: warning: "PCI_BUS" redefined [enabled by default]
> include/uapi/linux/pci.h:36:0: note: this is the location of the previous definition
> CC [M] drivers/net/wireless/b43legacy/dma.o
> CC [M] drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.o
> CC [M] drivers/net/wireless/b43legacy/pio.o
> In file included from drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c:29:0:
> drivers/net/wireless/brcm80211/include/defs.h:23:0: warning: "PCI_BUS" redefined [enabled by default]
> include/uapi/linux/pci.h:36:0: note: this is the location of the previous definition
> In file included from drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c:29:0:
> drivers/net/wireless/brcm80211/include/defs.h:23:0: warning: "PCI_BUS" redefined [enabled by default]
> include/uapi/linux/pci.h:36:0: note: this is the location of the previous definition
Strange, I do not see PCI_BUS defined anywhere in the include/ branch in either
3.8 or 3.9. In addition, I don't get these warnings. What is different in your
system?
Larry
>
> Signed-off-by: Shuah Khan <[email protected]>
> ---
> drivers/net/wireless/brcm80211/include/defs.h | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/drivers/net/wireless/brcm80211/include/defs.h b/drivers/net/wireless/brcm80211/include/defs.h
> index fb7cbcf..3608436 100644
> --- a/drivers/net/wireless/brcm80211/include/defs.h
> +++ b/drivers/net/wireless/brcm80211/include/defs.h
> @@ -20,7 +20,6 @@
> #include <linux/types.h>
>
> #define SI_BUS 0
> -#define PCI_BUS 1
> #define PCMCIA_BUS 2
> #define SDIO_BUS 3
> #define JTAG_BUS 4
>
On Mon, Mar 4, 2013 at 6:28 PM, Larry Finger <[email protected]> wrote:
> On 03/04/2013 07:02 PM, Shuah Khan wrote:
>>
>> PCI_BUS defined in defs.h results in warnings from all brcm80211 source
>> files
>> including defs.h. This define is not used in brcm80211. Removing this
>> define
>> fixes the warning.
>>
>> In file included from
>> drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c:35:0:
>> drivers/net/wireless/brcm80211/include/defs.h:23:0: warning: "PCI_BUS"
>> redefined [enabled by default]
>> include/uapi/linux/pci.h:36:0: note: this is the location of the previous
>> definition
>> CC [M] drivers/net/wireless/b43legacy/dma.o
>> CC [M] drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.o
>> CC [M] drivers/net/wireless/b43legacy/pio.o
>> In file included from
>> drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c:29:0:
>> drivers/net/wireless/brcm80211/include/defs.h:23:0: warning: "PCI_BUS"
>> redefined [enabled by default]
>> include/uapi/linux/pci.h:36:0: note: this is the location of the previous
>> definition
>> In file included from
>> drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c:29:0:
>> drivers/net/wireless/brcm80211/include/defs.h:23:0: warning: "PCI_BUS"
>> redefined [enabled by default]
>> include/uapi/linux/pci.h:36:0: note: this is the location of the previous
>> definition
>
>
> Strange, I do not see PCI_BUS defined anywhere in the include/ branch in
> either 3.8 or 3.9. In addition, I don't get these warnings. What is
> different in your system?
>
> Larry
I am sorry. Please ignore this patch. I had a old commit for a change
I was working on
and I thought I undid the changes. My apologies for the noise.
-- Shuah