---

yaml
---
r: 256387
b: refs/heads/master
c: 9a7b150
h: refs/heads/master
i:
  256385: df08e38
  256383: 635bb61
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d8598981146241064993e371cea8333f59553cb6
+refs/heads/master: 9a7b1501182477299e678b787e32fca5844c7ea1

trunk/drivers/Kconfig

@@ -92,6 +92,8 @@ source "drivers/memstick/Kconfig"
 
 source "drivers/leds/Kconfig"
 
+source "drivers/nfc/Kconfig"
+
 source "drivers/accessibility/Kconfig"
 
 source "drivers/infiniband/Kconfig"

trunk/drivers/Makefile

@@ -120,4 +120,3 @@ obj-y				+= ieee802154/
 obj-y				+= clk/
 
 obj-$(CONFIG_HWSPINLOCK)	+= hwspinlock/
-obj-$(CONFIG_NFC)		+= nfc/

trunk/drivers/bcma/Kconfig

@@ -27,12 +27,6 @@ config BCMA_HOST_PCI
 	bool "Support for BCMA on PCI-host bus"
 	depends on BCMA_HOST_PCI_POSSIBLE
 
-config BCMA_DRIVER_PCI_HOSTMODE
-	bool "Driver for PCI core working in hostmode"
-	depends on BCMA && MIPS
-	help
-	  PCI core hostmode operation (external PCI bus).
-
 config BCMA_DEBUG
 	bool "BCMA debugging"
 	depends on BCMA

trunk/drivers/bcma/Makefile

@@ -1,7 +1,6 @@
 bcma-y					+= main.o scan.o core.o sprom.o
 bcma-y					+= driver_chipcommon.o driver_chipcommon_pmu.o
 bcma-y					+= driver_pci.o
-bcma-$(CONFIG_BCMA_DRIVER_PCI_HOSTMODE)	+= driver_pci_host.o
 bcma-$(CONFIG_BCMA_HOST_PCI)		+= host_pci.o
 obj-$(CONFIG_BCMA)			+= bcma.o
 

trunk/drivers/bcma/bcma_private.h

@@ -28,8 +28,4 @@ extern int __init bcma_host_pci_init(void);
 extern void __exit bcma_host_pci_exit(void);
 #endif /* CONFIG_BCMA_HOST_PCI */
 
-#ifdef CONFIG_BCMA_DRIVER_PCI_HOSTMODE
-void bcma_core_pci_hostmode_init(struct bcma_drv_pci *pc);
-#endif /* CONFIG_BCMA_DRIVER_PCI_HOSTMODE */
-
 #endif

trunk/drivers/bcma/driver_pci.c

@@ -157,45 +157,9 @@ static void bcma_pcicore_serdes_workaround(struct bcma_drv_pci *pc)
  * Init.
  **************************************************/
 
-static void bcma_core_pci_clientmode_init(struct bcma_drv_pci *pc)
-{
-	bcma_pcicore_serdes_workaround(pc);
-}
-
-static bool bcma_core_pci_is_in_hostmode(struct bcma_drv_pci *pc)
-{
-	struct bcma_bus *bus = pc->core->bus;
-	u16 chipid_top;
-
-	chipid_top = (bus->chipinfo.id & 0xFF00);
-	if (chipid_top != 0x4700 &&
-	    chipid_top != 0x5300)
-		return false;
-
-	if (bus->sprom.boardflags_lo & SSB_PCICORE_BFL_NOPCI)
-		return false;
-
-#if 0
-	/* TODO: on BCMA we use address from EROM instead of magic formula */
-	u32 tmp;
-	return !mips_busprobe32(tmp, (bus->mmio +
-		(pc->core->core_index * BCMA_CORE_SIZE)));
-#endif
-
-	return true;
-}
-
 void bcma_core_pci_init(struct bcma_drv_pci *pc)
 {
-	if (bcma_core_pci_is_in_hostmode(pc)) {
-#ifdef CONFIG_BCMA_DRIVER_PCI_HOSTMODE
-		bcma_core_pci_hostmode_init(pc);
-#else
-		pr_err("Driver compiled without support for hostmode PCI\n");
-#endif /* CONFIG_BCMA_DRIVER_PCI_HOSTMODE */
-	} else {
-		bcma_core_pci_clientmode_init(pc);
-	}
+	bcma_pcicore_serdes_workaround(pc);
 }
 
 int bcma_core_pci_irq_ctl(struct bcma_drv_pci *pc, struct bcma_device *core,

trunk/drivers/bcma/main.c

@@ -7,7 +7,6 @@
 
 #include "bcma_private.h"
 #include <linux/bcma/bcma.h>
-#include <linux/slab.h>
 
 MODULE_DESCRIPTION("Broadcom's specific AMBA driver");
 MODULE_LICENSE("GPL");

trunk/drivers/net/wireless/ath/ath5k/ahb.c

@@ -167,8 +167,8 @@ static int ath_ahb_probe(struct platform_device *pdev)
 		 * driver for it
 		 */
 		if (to_platform_device(sc->dev)->id == 0 &&
-		    (bcfg->config->flags & (BD_WLAN0 | BD_WLAN1)) ==
-		     (BD_WLAN1 | BD_WLAN0))
+		    (bcfg->config->flags & (BD_WLAN0|BD_WLAN1)) ==
+		     (BD_WLAN1|BD_WLAN0))
 			__set_bit(ATH_STAT_2G_DISABLED, sc->status);
 	}
 

trunk/drivers/net/wireless/ath/ath5k/ani.c

@@ -642,7 +642,7 @@ ath5k_ani_init(struct ath5k_hw *ah, enum ath5k_ani_mode mode)
 	/* initial values for our ani parameters */
 	if (mode == ATH5K_ANI_MODE_OFF) {
 		ATH5K_DBG_UNLIMIT(ah->ah_sc, ATH5K_DEBUG_ANI, "ANI off\n");
-	} else if (mode == ATH5K_ANI_MODE_MANUAL_LOW) {
+	} else if  (mode == ATH5K_ANI_MODE_MANUAL_LOW) {
 		ATH5K_DBG_UNLIMIT(ah->ah_sc, ATH5K_DEBUG_ANI,
 			"ANI manual low -> high sensitivity\n");
 		ath5k_ani_set_noise_immunity_level(ah, 0);