Merge tag 'wireless-drivers-next-for-davem-2019-02-06' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next

Kalle Valo says:

====================
wireless-drivers-next patches for 5.1

First set of patches for 5.1. Lots of new features in various drivers
but nothing really special standing out.

Major changes:

brcmfmac

* DMI nvram filename quirk for PoV TAB-P1006W-232 tablet

rsi

* support for hardware scan offload

iwlwifi

* support for Target Wakeup Time (TWT) -- a feature that allows the AP
  to specify when individual stations can access the medium

* support for mac80211 AMSDU handling

* some new PCI IDs

* relicense the pcie submodule to dual GPL/BSD

* reworked the TOF/CSI (channel estimation matrix) implementation

* Some product name updates in the human-readable strings

mt76

* energy detect regulatory compliance fixes

* preparation for MT7603 support

* channel switch announcement support

mwifiex

* support for sd8977 chipset

qtnfmac

* support for 4addr mode

* convert to SPDX license identifiers
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 3 insertions, 8 deletions

diff --git a/include/linux/bcma/bcma.h b/include/linux/bcma/bcma.h
index ef61f3607e99..60b94b944e9f 100644
--- a/include/linux/bcma/bcma.h
+++ b/include/linux/bcma/bcma.h
@@ -332,6 +332,8 @@ extern int bcma_arch_register_fallback_sprom(
                 struct ssb_sprom *out));
 
 struct bcma_bus {
+        struct device *dev;
+
         /* The MMIO area. */
         void __iomem *mmio;
 
@@ -339,14 +341,7 @@ struct bcma_bus {
 
         enum bcma_hosttype hosttype;
         bool host_is_pcie2; /* Used for BCMA_HOSTTYPE_PCI only */
-        union {
-                /* Pointer to the PCI bus (only for BCMA_HOSTTYPE_PCI) */
-                struct pci_dev *host_pci;
-                /* Pointer to the SDIO device (only for BCMA_HOSTTYPE_SDIO) */
-                struct sdio_func *host_sdio;
-                /* Pointer to platform device (only for BCMA_HOSTTYPE_SOC) */
-                struct platform_device *host_pdev;
-        };
+        struct pci_dev *host_pci; /* PCI bus pointer (BCMA_HOSTTYPE_PCI only) */
 
         struct bcma_chipinfo chipinfo;