[PATCH 3/5] brcm80211: use native PCI header defines

Stanislav Fomichev kernel at fomichev.me
Sun Apr 10 18:34:20 UTC 2011


Signed-off-by: Stanislav Fomichev <kernel at fomichev.me>
---
 drivers/staging/brcm80211/include/pcicfg.h |    5 -----
 drivers/staging/brcm80211/util/nicpci.c    |    2 +-
 2 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/brcm80211/include/pcicfg.h b/drivers/staging/brcm80211/include/pcicfg.h
index 4a519f2..dff8ae5 100644
--- a/drivers/staging/brcm80211/include/pcicfg.h
+++ b/drivers/staging/brcm80211/include/pcicfg.h
@@ -56,11 +56,6 @@ typedef struct _pci_config_regs {
 
 /* Classes and subclasses */
 
-/* Header types */
-typedef enum {
-	PCI_HEADER_NORMAL
-} pci_header_types;
-
 /* Overlay for a PCI-to-PCI bridge */
 
 #define	PPB_RSVDA_MAX		2
diff --git a/drivers/staging/brcm80211/util/nicpci.c b/drivers/staging/brcm80211/util/nicpci.c
index ecc0039..d56eaf8 100644
--- a/drivers/staging/brcm80211/util/nicpci.c
+++ b/drivers/staging/brcm80211/util/nicpci.c
@@ -130,7 +130,7 @@ pcicore_find_pci_capability(void *dev, u8 req_cap_id,
 
 	/* check for Header type 0 */
 	pci_read_config_byte(dev, PCI_HEADER_TYPE, &byte_val);
-	if ((byte_val & 0x7f) != PCI_HEADER_NORMAL)
+	if ((byte_val & 0x7f) != PCI_HEADER_TYPE_NORMAL)
 		goto end;
 
 	/* check if the capability pointer field exists */
-- 
1.7.1




More information about the devel mailing list