forked from ~ljy/RK356X_SDK_RELEASE

blame | history | patch | commit | commitdiff
hc
2024-10-22 8ac6c7a54ed1b98d142dce24b11c6de6a1e239a5 
 kernel/include/linux/bcma/bcma.h
....@@ -332,6 +332,8 @@
332332 		struct ssb_sprom *out));
333333 
334334 struct bcma_bus {
335
+	struct device *dev;
336
+
335337 	/* The MMIO area. */
336338 	void __iomem *mmio;
337339 
....@@ -339,14 +341,7 @@
339341 
340342 	enum bcma_hosttype hosttype;
341343 	bool host_is_pcie2; /* Used for BCMA_HOSTTYPE_PCI only */
342
-	union {
343
-		/* Pointer to the PCI bus (only for BCMA_HOSTTYPE_PCI) */
344
-		struct pci_dev *host_pci;
345
-		/* Pointer to the SDIO device (only for BCMA_HOSTTYPE_SDIO) */
346
-		struct sdio_func *host_sdio;
347
-		/* Pointer to platform device (only for BCMA_HOSTTYPE_SOC) */
348
-		struct platform_device *host_pdev;
349
-	};
344
+	struct pci_dev *host_pci; /* PCI bus pointer (BCMA_HOSTTYPE_PCI only) */
350345 
351346 	struct bcma_chipinfo chipinfo;
352347