---

yaml
---
r: 255718
b: refs/heads/master
c: d0fad89
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5a9d0a3ffbc40ea1f5a0636501e7599cbb327bcc
+refs/heads/master: d0fad89da9801b3945d2ee7243ecbc75b3da6f09

trunk/drivers/bcma/Kconfig

@@ -13,11 +13,6 @@ config BCMA
 	  Bus driver for Broadcom specific Advanced Microcontroller Bus
 	  Architecture.
 
-# Support for Block-I/O. SELECT this from the driver that needs it.
-config BCMA_BLOCKIO
-	bool
-	depends on BCMA
-
 config BCMA_HOST_PCI_POSSIBLE
 	bool
 	depends on BCMA && PCI = y

trunk/drivers/bcma/Makefile

@@ -1,4 +1,4 @@
-bcma-y					+= main.o scan.o core.o sprom.o
+bcma-y					+= main.o scan.o core.o
 bcma-y					+= driver_chipcommon.o driver_chipcommon_pmu.o
 bcma-y					+= driver_pci.o
 bcma-$(CONFIG_BCMA_HOST_PCI)		+= host_pci.o

trunk/drivers/bcma/bcma_private.h

@@ -19,9 +19,6 @@ extern void bcma_bus_unregister(struct bcma_bus *bus);
 /* scan.c */
 int bcma_bus_scan(struct bcma_bus *bus);
 
-/* sprom.c */
-int bcma_sprom_get(struct bcma_bus *bus);
-
 #ifdef CONFIG_BCMA_HOST_PCI
 /* host_pci.c */
 extern int __init bcma_host_pci_init(void);

trunk/drivers/bcma/driver_pci.c

@@ -161,26 +161,3 @@ void bcma_core_pci_init(struct bcma_drv_pci *pc)
 {
 	bcma_pcicore_serdes_workaround(pc);
 }
-
-int bcma_core_pci_irq_ctl(struct bcma_drv_pci *pc, struct bcma_device *core,
-			  bool enable)
-{
-	struct pci_dev *pdev = pc->core->bus->host_pci;
-	u32 coremask, tmp;
-	int err;
-
-	err = pci_read_config_dword(pdev, BCMA_PCI_IRQMASK, &tmp);
-	if (err)
-		goto out;
-
-	coremask = BIT(core->core_index) << 8;
-	if (enable)
-		tmp |= coremask;
-	else
-		tmp &= ~coremask;
-
-	err = pci_write_config_dword(pdev, BCMA_PCI_IRQMASK, tmp);
-
-out:
-	return err;
-}

trunk/drivers/bcma/host_pci.c

@@ -64,54 +64,6 @@ static void bcma_host_pci_write32(struct bcma_device *core, u16 offset,
 	iowrite32(value, core->bus->mmio + offset);
 }
 
-#ifdef CONFIG_BCMA_BLOCKIO
-void bcma_host_pci_block_read(struct bcma_device *core, void *buffer,
-			      size_t count, u16 offset, u8 reg_width)
-{
-	void __iomem *addr = core->bus->mmio + offset;
-	if (core->bus->mapped_core != core)
-		bcma_host_pci_switch_core(core);
-	switch (reg_width) {
-	case sizeof(u8):
-		ioread8_rep(addr, buffer, count);
-		break;
-	case sizeof(u16):
-		WARN_ON(count & 1);
-		ioread16_rep(addr, buffer, count >> 1);
-		break;
-	case sizeof(u32):
-		WARN_ON(count & 3);
-		ioread32_rep(addr, buffer, count >> 2);
-		break;
-	default:
-		WARN_ON(1);
-	}
-}
-
-void bcma_host_pci_block_write(struct bcma_device *core, const void *buffer,
-			       size_t count, u16 offset, u8 reg_width)
-{
-	void __iomem *addr = core->bus->mmio + offset;
-	if (core->bus->mapped_core != core)
-		bcma_host_pci_switch_core(core);
-	switch (reg_width) {
-	case sizeof(u8):
-		iowrite8_rep(addr, buffer, count);
-		break;
-	case sizeof(u16):
-		WARN_ON(count & 1);
-		iowrite16_rep(addr, buffer, count >> 1);
-		break;
-	case sizeof(u32):
-		WARN_ON(count & 3);
-		iowrite32_rep(addr, buffer, count >> 2);
-		break;
-	default:
-		WARN_ON(1);
-	}
-}
-#endif
-
 static u32 bcma_host_pci_aread32(struct bcma_device *core, u16 offset)
 {
 	if (core->bus->mapped_core != core)
@@ -134,10 +86,6 @@ const struct bcma_host_ops bcma_host_pci_ops = {
 	.write8		= bcma_host_pci_write8,
 	.write16	= bcma_host_pci_write16,
 	.write32	= bcma_host_pci_write32,
-#ifdef CONFIG_BCMA_BLOCKIO
-	.block_read	= bcma_host_pci_block_read,
-	.block_write	= bcma_host_pci_block_write,
-#endif
 	.aread32	= bcma_host_pci_aread32,
 	.awrite32	= bcma_host_pci_awrite32,
 };

trunk/drivers/bcma/main.c

@@ -89,8 +89,6 @@ static int bcma_register_cores(struct bcma_bus *bus)
 		switch (bus->hosttype) {
 		case BCMA_HOSTTYPE_PCI:
 			core->dev.parent = &bus->host_pci->dev;
-			core->dma_dev = &bus->host_pci->dev;
-			core->irq = bus->host_pci->irq;
 			break;
 		case BCMA_HOSTTYPE_NONE:
 		case BCMA_HOSTTYPE_SDIO:
@@ -146,13 +144,6 @@ int bcma_bus_register(struct bcma_bus *bus)
 		bcma_core_pci_init(&bus->drv_pci);
 	}
 
-	/* Try to get SPROM */
-	err = bcma_sprom_get(bus);
-	if (err) {
-		pr_err("Failed to get SPROM: %d\n", err);
-		return -ENOENT;
-	}
-
 	/* Register found cores */
 	bcma_register_cores(bus);
 

trunk/drivers/net/wireless/ath/ath.h

@@ -161,7 +161,6 @@ struct ath_common {
 	const struct ath_bus_ops *bus_ops;
 
 	bool btcoex_enabled;
-	bool disable_ani;
 };
 
 struct sk_buff *ath_rxbuf_alloc(struct ath_common *common,

trunk/drivers/net/wireless/ath/ath9k/ar9002_mac.c

@@ -28,6 +28,11 @@ static void ar9002_hw_set_desc_link(void *ds, u32 ds_link)
 	((struct ath_desc*) ds)->ds_link = ds_link;
 }
 
+static void ar9002_hw_get_desc_link(void *ds, u32 **ds_link)
+{
+	*ds_link = &((struct ath_desc *)ds)->ds_link;
+}
+
 static bool ar9002_hw_get_isr(struct ath_hw *ah, enum ath9k_int *masked)
 {
 	u32 isr = 0;
@@ -432,6 +437,7 @@ void ar9002_hw_attach_mac_ops(struct ath_hw *ah)
 
 	ops->rx_enable = ar9002_hw_rx_enable;
 	ops->set_desc_link = ar9002_hw_set_desc_link;
+	ops->get_desc_link = ar9002_hw_get_desc_link;
 	ops->get_isr = ar9002_hw_get_isr;
 	ops->fill_txdesc = ar9002_hw_fill_txdesc;
 	ops->proc_txdesc = ar9002_hw_proc_txdesc;

trunk/drivers/net/wireless/ath/ath9k/ar9003_mac.c

@@ -43,6 +43,13 @@ static void ar9003_hw_set_desc_link(void *ds, u32 ds_link)
 	ads->ctl10 |= ar9003_calc_ptr_chksum(ads);
 }
 
+static void ar9003_hw_get_desc_link(void *ds, u32 **ds_link)
+{
+	struct ar9003_txc *ads = ds;
+
+	*ds_link = &ads->link;
+}
+
 static bool ar9003_hw_get_isr(struct ath_hw *ah, enum ath9k_int *masked)
 {
 	u32 isr = 0;
@@ -491,6 +498,7 @@ void ar9003_hw_attach_mac_ops(struct ath_hw *hw)
 
 	ops->rx_enable = ar9003_hw_rx_enable;
 	ops->set_desc_link = ar9003_hw_set_desc_link;
+	ops->get_desc_link = ar9003_hw_get_desc_link;
 	ops->get_isr = ar9003_hw_get_isr;
 	ops->fill_txdesc = ar9003_hw_fill_txdesc;
 	ops->proc_txdesc = ar9003_hw_proc_txdesc;