mt76: move __iomem regs in mt76_mmio

Move __iomem regs pointer in mt76_mmio data structure

Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mmio.c b/drivers/net/wireless/mediatek/mt76/mmio.c
index 11a74c3..2f09f45 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mmio.c
+++ b/drivers/net/wireless/mediatek/mt76/mmio.c
@@ -21,7 +21,7 @@ static u32 mt76_mmio_rr(struct mt76_dev *dev, u32 offset)
 {
        u32 val;
 
-       val = ioread32(dev->regs + offset);
+       val = ioread32(dev->mmio.regs + offset);
        trace_reg_rr(dev, offset, val);
 
        return val;
@@ -30,7 +30,7 @@ static u32 mt76_mmio_rr(struct mt76_dev *dev, u32 offset)
 static void mt76_mmio_wr(struct mt76_dev *dev, u32 offset, u32 val)
 {
        trace_reg_wr(dev, offset, val);
-       iowrite32(val, dev->regs + offset);
+       iowrite32(val, dev->mmio.regs + offset);
 }
 
 static u32 mt76_mmio_rmw(struct mt76_dev *dev, u32 offset, u32 mask, u32 val)
@@ -43,7 +43,7 @@ static u32 mt76_mmio_rmw(struct mt76_dev *dev, u32 offset, u32 mask, u32 val)
 static void mt76_mmio_copy(struct mt76_dev *dev, u32 offset, const void *data,
                           int len)
 {
-       __iowrite32_copy(dev->regs + offset, data, len >> 2);
+       __iowrite32_copy(dev->mmio.regs + offset, data, len >> 2);
 }
 
 void mt76_mmio_init(struct mt76_dev *dev, void __iomem *regs)
@@ -56,7 +56,7 @@ void mt76_mmio_init(struct mt76_dev *dev, void __iomem *regs)
        };
 
        dev->bus = &mt76_mmio_ops;
-       dev->regs = regs;
+       dev->mmio.regs = regs;
 
        skb_queue_head_init(&dev->mmio.mcu.res_q);
        init_waitqueue_head(&dev->mmio.mcu.wait);

diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h
index 8c9b78d..5698321 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76.h
@@ -347,6 +347,7 @@ struct mt76_mmio {
 
                u32 msg_seq;
        } mcu;
+       void __iomem *regs;
 };
 
 struct mt76_dev {
@@ -362,7 +363,6 @@ struct mt76_dev {
        const struct mt76_bus_ops *bus;
        const struct mt76_driver_ops *drv;
        const struct mt76_mcu_ops *mcu_ops;
-       void __iomem *regs;
        struct device *dev;
 
        struct net_device napi_dev;

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2_dma.c b/drivers/net/wireless/mediatek/mt76/mt76x2_dma.c
index 3c6bbb7..b1d6937 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x2_dma.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2_dma.c
@@ -53,7 +53,7 @@ mt76x2_init_tx_queue(struct mt76x2_dev *dev, struct mt76_queue *q,
 {
        int ret;
 
-       q->regs = dev->mt76.regs + MT_TX_RING_BASE + idx * MT_RING_SIZE;
+       q->regs = dev->mt76.mmio.regs + MT_TX_RING_BASE + idx * MT_RING_SIZE;
        q->ndesc = n_desc;
        q->hw_idx = idx;
 
@@ -72,7 +72,7 @@ mt76x2_init_rx_queue(struct mt76x2_dev *dev, struct mt76_queue *q,
 {
        int ret;
 
-       q->regs = dev->mt76.regs + MT_RX_RING_BASE + idx * MT_RING_SIZE;
+       q->regs = dev->mt76.mmio.regs + MT_RX_RING_BASE + idx * MT_RING_SIZE;
        q->ndesc = n_desc;
        q->buf_size = bufsize;