brcm80211: replace VENDOR_BROADCOM with PCI_VENDOR_ID_BROADCOM

use Linux native defines

Signed-off-by: Stanislav Fomichev <kernel@fomichev.me>
Acked-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh.c
index 473f57d9f00b4895e60ae07b15b88c97dc46a582..f15ee63e5f28624d77fcb6ba59db6a02da92454c 100644 (file)
--- a/drivers/staging/brcm80211/brcmfmac/bcmsdh.c
+++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh.c
@@ -17,6 +17,7 @@
 
 #include <linux/types.h>
 #include <linux/netdevice.h>
+#include <linux/pci_ids.h>
 #include <bcmdefs.h>
 #include <bcmdevs.h>
 #include <bcmutils.h>
@@ -580,7 +581,7 @@ int bcmsdh_stop(void *sdh)
 int bcmsdh_query_device(void *sdh)
 {
        bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *) sdh;
-       bcmsdh->vendevid = (VENDOR_BROADCOM << 16) | 0;
+       bcmsdh->vendevid = (PCI_VENDOR_ID_BROADCOM << 16) | 0;
        return bcmsdh->vendevid;
 }
 

diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c
index ac5bbc8722e5ac586d5a7d6af361bc0c343e5b56..0188417b65936592fae027203d6004285625a7bb 100644 (file)
--- a/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c
+++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c
@@ -87,11 +87,11 @@ bool bcmsdh_chipmatch(u16 vendor, u16 device)
                return true;
 
        /* Check for BRCM 27XX Standard host controller */
-       if (device == BCM27XX_SDIOH_ID && vendor == VENDOR_BROADCOM)
+       if (device == BCM27XX_SDIOH_ID && vendor == PCI_VENDOR_ID_BROADCOM)
                return true;
 
        /* Check for BRCM Standard host controller */
-       if (device == SDIOH_FPGA_ID && vendor == VENDOR_BROADCOM)
+       if (device == SDIOH_FPGA_ID && vendor == PCI_VENDOR_ID_BROADCOM)
                return true;
 
        /* Check for TI PCIxx21 Standard host controller */
@@ -111,7 +111,7 @@ bool bcmsdh_chipmatch(u16 vendor, u16 device)
 #endif                         /* BCMSDIOH_STD */
 #ifdef BCMSDIOH_SPI
        /* This is the PciSpiHost. */
-       if (device == SPIH_FPGA_ID && vendor == VENDOR_BROADCOM) {
+       if (device == SPIH_FPGA_ID && vendor == PCI_VENDOR_ID_BROADCOM) {
                WL_NONE("Found PCI SPI Host Controller\n");
                return true;
        }

diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
index 106627040db078c8870887cb0bd8e8dd73490931..1111920b0da15b8d721098a84025671d50ffc34a 100644 (file)
--- a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
@@ -15,6 +15,7 @@
  */
 
 #include <linux/types.h>
+#include <linux/pci_ids.h>
 #include <bcmdefs.h>
 #include <linux/netdevice.h>
 #include <bcmsdh.h>
@@ -5089,7 +5090,7 @@ static void *dhdsdio_probe(u16 venid, u16 devid, u16 bus_no,
        /* Check the Vendor ID */
        switch (venid) {
        case 0x0000:
-       case VENDOR_BROADCOM:
+       case PCI_VENDOR_ID_BROADCOM:
                break;
        default:
                DHD_ERROR(("%s: unknown vendor: 0x%04x\n", __func__, venid));

diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c b/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c
index 31716785b61dd844ae551738aac5920e8b5e6b25..f7dab5485bf4ebc6992aa300d4e6fdca3bfe51e3 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c
+++ b/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c
@@ -2034,7 +2034,7 @@ static bool wlc_validboardtype(struct wlc_hw_info *wlc_hw)
                        goodboard = false;
        }
 
-       if (wlc_hw->sih->boardvendor != VENDOR_BROADCOM)
+       if (wlc_hw->sih->boardvendor != PCI_VENDOR_ID_BROADCOM)
                return goodboard;
 
        return goodboard;

diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_main.c b/drivers/staging/brcm80211/brcmsmac/wlc_main.c
index 6a4126f7ecf1e00c2d64b661906cf8a96d473e7f..ccad6b8d6416547f7ab846995b7f4aa5dba79fc1 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/wlc_main.c
+++ b/drivers/staging/brcm80211/brcmsmac/wlc_main.c
@@ -16,6 +16,7 @@
 #include <linux/kernel.h>
 #include <linux/ctype.h>
 #include <linux/etherdevice.h>
+#include <linux/pci_ids.h>
 #include <net/mac80211.h>
 
 #include <bcmdefs.h>
@@ -4871,7 +4872,7 @@ void wlc_statsupd(struct wlc_info *wlc)
 
 bool wlc_chipmatch(u16 vendor, u16 device)
 {
-       if (vendor != VENDOR_BROADCOM) {
+       if (vendor != PCI_VENDOR_ID_BROADCOM) {
                WL_ERROR("wlc_chipmatch: unknown vendor id %04x\n", vendor);
                return false;
        }

diff --git a/drivers/staging/brcm80211/include/bcmdevs.h b/drivers/staging/brcm80211/include/bcmdevs.h
index 075883a935291b58c832038e7fe400a5708edf97..7ccb25247209ad71a3fb2f51f1a69d95c14a56e0 100644 (file)
--- a/drivers/staging/brcm80211/include/bcmdevs.h
+++ b/drivers/staging/brcm80211/include/bcmdevs.h
@@ -17,9 +17,6 @@
 #ifndef        _BCMDEVS_H
 #define        _BCMDEVS_H
 
-/* PCI vendor IDs */
-#define        VENDOR_BROADCOM         0x14e4
-
 /* DONGLE VID/PIDs */
 #define BCM_DNGL_VID           0x0a5c
 #define BCM_DNGL_BDC_PID       0x0bdc

diff --git a/drivers/staging/brcm80211/util/siutils.c b/drivers/staging/brcm80211/util/siutils.c
index a77b457e28be7dffcf4eb0d4888cace34e6c6ce7..65b3ef3fc3e966c70554b3baade3c5b527e28b43 100644 (file)
--- a/drivers/staging/brcm80211/util/siutils.c
+++ b/drivers/staging/brcm80211/util/siutils.c
@@ -337,14 +337,14 @@ static __used void si_nvram_process(si_info_t *sii, char *pvars)
 
 #ifdef BCMSDIO
        case SPI_BUS:
-               sii->pub.boardvendor = VENDOR_BROADCOM;
+               sii->pub.boardvendor = PCI_VENDOR_ID_BROADCOM;
                sii->pub.boardtype = SPI_BOARD;
                break;
 #endif
 
        case SI_BUS:
        case JTAG_BUS:
-               sii->pub.boardvendor = VENDOR_BROADCOM;
+               sii->pub.boardvendor = PCI_VENDOR_ID_BROADCOM;
                sii->pub.boardtype = getintvar(pvars, "prodid");
                if (pvars == NULL || (sii->pub.boardtype == 0)) {
                        sii->pub.boardtype = getintvar(NULL, "boardtype");
@@ -1865,7 +1865,7 @@ bool si_deviceremoved(si_t *sih)
        case PCI_BUS:
                ASSERT(sii->pbus != NULL);
                pci_read_config_dword(sii->pbus, PCI_CFG_VID, &w);
-               if ((w & 0xFFFF) != VENDOR_BROADCOM)
+               if ((w & 0xFFFF) != PCI_VENDOR_ID_BROADCOM)
                        return true;
                break;
        }