gitops/mt76
1
0
Fork 0
mirror of https://github.com/outbackdingo/mt76.git synced 2026-10-24 13:26:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

move the struct device pointer to struct mt76_device

Browse Source 
Signed-off-by: Felix Fietkau <[email protected]>
This commit is contained in:
Felix Fietkau
2015-12-06 20:36:08 +01:00
parent e3dec20ce3
commit 38702fa03a
13 changed files with 36 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mt76.h
+1
View File
@@ -31,6 +31,7 @@ struct mt76_bus_ops {
struct mt76_dev {
const struct mt76_bus_ops *bus;
void __iomem *regs;
struct device *dev;
struct ieee80211_hw *hw;
};
mt7603.h
-1
View File
@@ -23,7 +23,6 @@
struct mt7603_dev {
struct mt76_dev mt76;
struct device *dev;
u32 rev;
};
mt7603_init.c
+1 -1
View File
@@ -23,7 +23,7 @@ struct mt7603_dev *mt7603_alloc_device(struct device *pdev)
return NULL;
dev = hw->priv;
dev->dev = pdev;
dev->mt76.dev = pdev;
dev->mt76.hw = hw;
return dev;
mt7603_mcu.c
+5 -5
View File
@@ -28,7 +28,7 @@ mt7603_load_firmware(struct mt7603_dev *dev)
u32 val;
int ret;
ret = request_firmware(&fw, MT7603_FIRMWARE_E1, dev->dev);
ret = request_firmware(&fw, MT7603_FIRMWARE_E1, dev->mt76.dev);
if (ret)
return ret;
@@ -37,8 +37,8 @@ mt7603_load_firmware(struct mt7603_dev *dev)
hdr = (const struct mt7603_fw_trailer *) (fw->data + fw->size - sizeof(*hdr));
dev_info(dev->dev, "Firmware Version: %.10s\n", hdr->fw_ver);
dev_info(dev->dev, "Build Time: %.15s\n", hdr->build_date);
dev_info(dev->mt76.dev, "Firmware Version: %.10s\n", hdr->fw_ver);
dev_info(dev->mt76.dev, "Build Time: %.15s\n", hdr->build_date);
val = mt76_rr(dev, MT_MCU_PCIE_REMAP_1);
mt76_wr(dev, MT_MCU_PCIE_REMAP_1,
@@ -59,12 +59,12 @@ mt7603_load_firmware(struct mt7603_dev *dev)
val = mt76_rr(dev, MT_TOP_MISC2);
if (val & BIT(1)) {
dev_info(dev->dev, "Firmware already running!\n");
dev_info(dev->mt76.dev, "Firmware already running!\n");
goto out;
}
if (!mt76_poll(dev, MT_TOP_MISC2, BIT(0), BIT(0), 500)) {
dev_err(dev->dev, "Timeout waiting for ROM code to become ready\n");
dev_err(dev->mt76.dev, "Timeout waiting for ROM code to become ready\n");
ret = -EIO;
goto out;
}
mt7603_pci.c
+1 -1
View File
@@ -51,7 +51,7 @@ mt76pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
pci_set_drvdata(pdev, dev);
dev->rev = mt76_rr(dev, MT_ASIC_VERSION);
dev_printk(KERN_INFO, dev->dev, "ASIC revision: %08x\n", dev->rev);
dev_printk(KERN_INFO, dev->mt76.dev, "ASIC revision: %08x\n", dev->rev);
ret = mt7603_mcu_init(dev);
if (ret)
mt76x2.h
-1
View File
@@ -167,7 +167,6 @@ struct mt76x2_dma_ops {
struct mt76x2_dev {
struct mt76_dev mt76;
struct device *dev;
u8 macaddr[ETH_ALEN];
struct mac_address macaddr_list[8];
mt76x2_debugfs.c
+1 -1
View File
@@ -117,5 +117,5 @@ void mt76x2_init_debugfs(struct mt76x2_dev *dev)
debugfs_create_u32("regidx", S_IRUSR | S_IWUSR, dir, &dev->debugfs_reg);
debugfs_create_file("regval", S_IRUSR | S_IWUSR, dir, dev, &fops_regval);
debugfs_create_file("ampdu_stat", S_IRUSR, dir, dev, &fops_ampdu_stat);
debugfs_create_devm_seqfile(dev->dev, "txpower", dir, read_txpower);
debugfs_create_devm_seqfile(dev->mt76.dev, "txpower", dir, read_txpower);
}
mt76x2_dma.c
+15 -15
View File
@@ -36,11 +36,11 @@ mt76x2_alloc_txwi(struct mt76x2_dev *dev)
int size;
size = (sizeof(*t) + L1_CACHE_BYTES - 1) & ~(L1_CACHE_BYTES - 1);
t = devm_kzalloc(dev->dev, size, GFP_ATOMIC);
t = devm_kzalloc(dev->mt76.dev, size, GFP_ATOMIC);
if (!t)
return NULL;
addr = dma_map_single(dev->dev, &t->txwi, sizeof(t->txwi), DMA_TO_DEVICE);
addr = dma_map_single(dev->mt76.dev, &t->txwi, sizeof(t->txwi), DMA_TO_DEVICE);
t->dma_addr = addr;
return t;
@@ -91,12 +91,12 @@ mt76x2_alloc_queue(struct mt76x2_dev *dev, struct mt76x2_queue *q)
int i;
size = q->ndesc * sizeof(struct mt76x2_desc);
q->desc = dmam_alloc_coherent(dev->dev, size, &q->desc_dma, GFP_KERNEL);
q->desc = dmam_alloc_coherent(dev->mt76.dev, size, &q->desc_dma, GFP_KERNEL);
if (!q->desc)
return -ENOMEM;
size = q->ndesc * sizeof(*q->entry);
q->entry = devm_kzalloc(dev->dev, size, GFP_KERNEL);
q->entry = devm_kzalloc(dev->mt76.dev, size, GFP_KERNEL);
if (!q->entry)
return -ENOMEM;
@@ -169,8 +169,8 @@ mt76x2_dma_rx_fill(struct mt76x2_dev *dev, struct mt76x2_queue *q)
if (!buf)
break;
addr = dma_map_single(dev->dev, buf, len, DMA_FROM_DEVICE);
if (dma_mapping_error(dev->dev, addr)) {
addr = dma_map_single(dev->mt76.dev, buf, len, DMA_FROM_DEVICE);
if (dma_mapping_error(dev->mt76.dev, addr)) {
kfree(buf);
break;
}
@@ -203,8 +203,8 @@ mt76x2_dma_tx_queue_mcu(struct mt76x2_dev *dev, enum mt76x2_txq_id qid,
MT76_SET(MT_MCU_MSG_PORT, CPU_TX_PORT) |
MT76_SET(MT_MCU_MSG_LEN, skb->len);
addr = dma_map_single(dev->dev, skb->data, skb->len, DMA_TO_DEVICE);
if (dma_mapping_error(dev->dev, addr))
addr = dma_map_single(dev->mt76.dev, skb->data, skb->len, DMA_TO_DEVICE);
if (dma_mapping_error(dev->mt76.dev, addr))
return -ENOMEM;
spin_lock_bh(&q->lock);
@@ -233,10 +233,10 @@ mt76x2_dma_tx_queue_skb(struct mt76x2_dev *dev, struct mt76x2_queue *q,
if (!t)
goto free;
dma_sync_single_for_cpu(dev->dev, t->dma_addr, sizeof(t->txwi),
dma_sync_single_for_cpu(dev->mt76.dev, t->dma_addr, sizeof(t->txwi),
DMA_TO_DEVICE);
mt76x2_mac_write_txwi(dev, &t->txwi, skb, wcid, sta);
dma_sync_single_for_device(dev->dev, t->dma_addr, sizeof(t->txwi),
dma_sync_single_for_device(dev->mt76.dev, t->dma_addr, sizeof(t->txwi),
DMA_TO_DEVICE);
ret = mt76_insert_hdr_pad(skb);
@@ -255,8 +255,8 @@ mt76x2_dma_tx_queue_skb(struct mt76x2_dev *dev, struct mt76x2_queue *q,
if (!wcid || wcid->hw_key_idx == 0xff)
tx_info |= MT_TXD_INFO_WIV;
addr = dma_map_single(dev->dev, skb->data, skb->len, DMA_TO_DEVICE);
if (dma_mapping_error(dev->dev, addr))
addr = dma_map_single(dev->mt76.dev, skb->data, skb->len, DMA_TO_DEVICE);
if (dma_mapping_error(dev->mt76.dev, addr))
goto put_txwi;
idx = mt76x2_queue_add_buf(dev, q, t->dma_addr, sizeof(t->txwi),
@@ -307,7 +307,7 @@ mt76x2_dma_tx_cleanup_idx(struct mt76x2_dev *dev, struct mt76x2_queue *q, int id
else
skb_addr = ACCESS_ONCE(q->desc[idx].buf0);
dma_unmap_single(dev->dev, skb_addr, skb->len, DMA_TO_DEVICE);
dma_unmap_single(dev->mt76.dev, skb_addr, skb->len, DMA_TO_DEVICE);
e->skb = NULL;
e->txwi = NULL;
e->schedule = false;
@@ -374,7 +374,7 @@ mt76x2_rx_get_buf(struct mt76x2_dev *dev, struct mt76x2_queue *q, int idx, int *
u32 ctl = ACCESS_ONCE(q->desc[idx].ctrl);
*len = MT76_GET(MT_DMA_CTL_SD_LEN0, ctl);
}
dma_unmap_single(dev->dev, buf_addr, buf_len, DMA_FROM_DEVICE);
dma_unmap_single(dev->mt76.dev, buf_addr, buf_len, DMA_FROM_DEVICE);
e->buf = NULL;
return buf;
@@ -628,6 +628,6 @@ void mt76x2_dma_cleanup(struct mt76x2_dev *dev)
mt76x2_rx_cleanup(dev, &dev->mcu.q_rx);
while ((t = __mt76x2_get_txwi(dev)) != NULL)
dma_unmap_single(dev->dev, t->dma_addr, sizeof(t->txwi),
dma_unmap_single(dev->mt76.dev, t->dma_addr, sizeof(t->txwi),
DMA_TO_DEVICE);
}
mt76x2_eeprom.c
+2 -2
View File
@@ -204,7 +204,7 @@ mt76x2_eeprom_load(struct mt76x2_dev *dev)
bool found;
dev->eeprom.size = len;
dev->eeprom.data = devm_kzalloc(dev->dev, len * 2, GFP_KERNEL);
dev->eeprom.data = devm_kzalloc(dev->mt76.dev, len * 2, GFP_KERNEL);
if (!dev->eeprom.data)
return -ENOMEM;
@@ -606,7 +606,7 @@ int mt76x2_eeprom_init(struct mt76x2_dev *dev)
mt76x2_eeprom_get_macaddr(dev);
if (!is_valid_ether_addr(dev->macaddr)) {
eth_random_addr(dev->macaddr);
dev_printk(KERN_INFO, dev->dev,
dev_printk(KERN_INFO, dev->mt76.dev,
"Invalid MAC address, using random address %pM\n",
dev->macaddr);
}
mt76x2_init.c
+4 -4
View File
@@ -568,7 +568,7 @@ struct mt76x2_dev *mt76x2_alloc_device(struct device *pdev)
return NULL;
dev = hw->priv;
dev->dev = pdev;
dev->mt76.dev = pdev;
dev->mt76.hw = hw;
mutex_init(&dev->mutex);
spin_lock_init(&dev->lock);
@@ -678,7 +678,7 @@ mt76x2_init_sband(struct mt76x2_dev *dev, struct ieee80211_supported_band *sband
int size;
size = n_chan * sizeof(*chan);
chanlist = devm_kmemdup(dev->dev, chan, size, GFP_KERNEL);
chanlist = devm_kmemdup(dev->mt76.dev, chan, size, GFP_KERNEL);
if (!chanlist)
return -ENOMEM;
@@ -789,7 +789,7 @@ int mt76x2_register_device(struct mt76x2_dev *dev)
int i, ret;
fifo_size = roundup_pow_of_two(32 * sizeof(struct mt76x2_tx_status));
status_fifo = devm_kzalloc(dev->dev, fifo_size, GFP_KERNEL);
status_fifo = devm_kzalloc(dev->mt76.dev, fifo_size, GFP_KERNEL);
if (!status_fifo)
return -ENOMEM;
@@ -799,7 +799,7 @@ int mt76x2_register_device(struct mt76x2_dev *dev)
if (ret)
return ret;
SET_IEEE80211_DEV(hw, dev->dev);
SET_IEEE80211_DEV(hw, dev->mt76.dev);
hw->queues = 4;
hw->max_rates = 1;
mt76x2_mcu.c
+2 -2
View File
@@ -137,7 +137,7 @@ mt76pci_load_rom_patch(struct mt76x2_dev *dev)
goto out;
}
ret = request_firmware(&fw, MT7662_ROM_PATCH, dev->dev);
ret = request_firmware(&fw, MT7662_ROM_PATCH, dev->mt76.dev);
if (ret)
goto out;
@@ -183,7 +183,7 @@ mt76pci_load_firmware(struct mt76x2_dev *dev)
__le32 *cur;
u32 offset, val;
ret = request_firmware(&fw, MT7662_FIRMWARE, dev->dev);
ret = request_firmware(&fw, MT7662_FIRMWARE, dev->mt76.dev);
if (ret)
return ret;
mt76x2_of.c
+2 -2
View File
@@ -34,7 +34,7 @@ static int mt76x2_check_eeprom(struct mt76x2_dev *dev, const char *type)
int
mt76x2_get_of_eeprom(struct mt76x2_dev *dev, int len)
{
struct device_node *np = dev->dev->of_node;
struct device_node *np = dev->mt76.dev->of_node;
struct mtd_info *mtd;
const __be32 *list;
const char *part;
@@ -85,7 +85,7 @@ mt76x2_get_of_eeprom(struct mt76x2_dev *dev, int len)
void
mt76x2_get_of_overrides(struct mt76x2_dev *dev)
{
struct device_node *np = dev->dev->of_node;
struct device_node *np = dev->mt76.dev->of_node;
const __be32 *val;
int size;
mt76x2_pci.c
+2 -2
View File
@@ -52,9 +52,9 @@ mt76pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
pci_set_drvdata(pdev, dev);
dev->rev = mt76_rr(dev, MT_ASIC_VERSION);
dev_printk(KERN_INFO, dev->dev, "ASIC revision: %08x\n", dev->rev);
dev_printk(KERN_INFO, dev->mt76.dev, "ASIC revision: %08x\n", dev->rev);
ret = devm_request_irq(dev->dev, pdev->irq, mt76x2_irq_handler,
ret = devm_request_irq(dev->mt76.dev, pdev->irq, mt76x2_irq_handler,
IRQF_SHARED, KBUILD_MODNAME, dev);
if (ret)
goto error;