Skip to contentSkip to conversation

net/wireless/brcm80211: remove PCI_BUS define from defs.h to fix warnings

PATCH In review Shuah Khan 3 participants 3 messages Mar 5, 2013

Subsystems (3)
lore
Share & tools
lore

Shuah Khan

author
#0 lore raw

PATCH 1/1 net/wireless/brcm80211: remove PCI_BUS define from defs.h to fix warnings

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

---
 drivers/net/wireless/brcm80211/include/defs.h |    1 -
 1 file changed, 1 deletion(-)
drivers/net/wireless/brcm80211/include/defs.h +0 -1
index fb7cbcf..3608436 100644
@@ -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
Signature · 1 line
1.7.9.5
#1 lore raw
Quoted 10 lines · Shuah Khan

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
Quoted 6 lines

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

Quoted 19 lines
---
  drivers/net/wireless/brcm80211/include/defs.h |    1 -
  1 file changed, 1 deletion(-)
drivers/net/wireless/brcm80211/include/defs.h +0 -1
index fb7cbcf..3608436 100644
@@ -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
#2 lore raw
Quoted 31 lines · Larry Finger
Quoted 16 lines · Shuah Khan

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
Quoted 12 lines

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

Quoted 5 lines

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