brcm80211: smac: move fields from struct si_pub to struct si_info

[mirror_ubuntu-bionic-kernel.git] / drivers / net / wireless / brcm80211 / brcmsmac / aiutils.h

diff --git a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.h b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.h
index b51d1e421e244ca0e92b2326d20c2c6b13fca5dd..f049179846e6eaf09b17eb5c500fc4d518580028 100644 (file)
--- a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.h
+++ b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.h
@@ -146,24 +146,15 @@
 struct si_pub {
        uint buscoretype;       /* PCI_CORE_ID, PCIE_CORE_ID, PCMCIA_CORE_ID */
        uint buscorerev;        /* buscore rev */
-       uint buscoreidx;        /* buscore index */
        int ccrev;              /* chip common core rev */
        u32 cccaps;             /* chip common capabilities */
-       u32 cccaps_ext; /* chip common capabilities extension */
        int pmurev;             /* pmu core rev */
        u32 pmucaps;            /* pmu capabilities */
        uint boardtype;         /* board type */
        uint boardvendor;       /* board vendor */
-       uint boardflags;        /* board flags */
-       uint boardflags2;       /* board flags2 */
        uint chip;              /* chip number */
        uint chiprev;           /* chip revision */
        uint chippkg;           /* chip package option */
-       u32 chipst;             /* chip status */
-       bool issim;             /* chip is in simulation or emulation */
-       uint socirev;           /* SOC interconnect rev */
-       bool pci_pr32414;
-
 };
 
 struct pci_dev;
@@ -195,7 +186,9 @@ struct si_info {
        void __iomem *curmap;                   /* current regs va */
        void __iomem *regs[SI_MAXCORES];        /* other regs va */
 
+       u32 chipst;             /* chip status */
        uint curidx;            /* current core index */
+       uint buscoreidx;        /* buscore index */
        uint numcores;          /* # discovered cores */
        uint coreid[SI_MAXCORES]; /* id of each core */
        u32 coresba[SI_MAXCORES]; /* backplane address of each core */