UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Stanislav Fomichev 2011-03-28 01:31:36 +04:00 committed by Greg Kroah-Hartman
parent 28562f3cd5
commit be1c09f987
7 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/staging/brcm80211/brcmfmac/bcmsdh.c
View File

@ -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;
}

6
drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c
View File

@ -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;
}

3
drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
View File

@ -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));

2
drivers/staging/brcm80211/brcmsmac/wlc_bmac.c
View File

@ -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;

3
drivers/staging/brcm80211/brcmsmac/wlc_main.c
View File

@ -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;
}

3
drivers/staging/brcm80211/include/bcmdevs.h
View File

@ -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

6
drivers/staging/brcm80211/util/siutils.c
View File

@ -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;
}