From 3c8e8a789b996df69cf4cdfbcc8663d8e4704fd5 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Tue, 6 Nov 2018 12:24:48 +0100 Subject: [PATCH] mt7603: use irq_lock/irqmask from struct mt76_dev Signed-off-by: Felix Fietkau --- mt7603/core.c | 12 ++++++------ mt7603/init.c | 2 -- mt7603/mac.c | 2 +- mt7603/mt7603.h | 3 --- 4 files changed, 7 insertions(+), 12 deletions(-) diff --git a/mt7603/core.c b/mt7603/core.c index 1d16258e..caec1079 100644 --- a/mt7603/core.c +++ b/mt7603/core.c @@ -20,11 +20,11 @@ void mt7603_set_irq_mask(struct mt7603_dev *dev, u32 clear, u32 set) { unsigned long flags; - spin_lock_irqsave(&dev->irq_lock, flags); - dev->irqmask &= ~clear; - dev->irqmask |= set; - mt76_wr(dev, MT_INT_MASK_CSR, dev->irqmask); - spin_unlock_irqrestore(&dev->irq_lock, flags); + spin_lock_irqsave(&dev->mt76.mmio.irq_lock, flags); + dev->mt76.mmio.irqmask &= ~clear; + dev->mt76.mmio.irqmask |= set; + mt76_wr(dev, MT_INT_MASK_CSR, dev->mt76.mmio.irqmask); + spin_unlock_irqrestore(&dev->mt76.mmio.irq_lock, flags); } void mt7603_rx_poll_complete(struct mt76_dev *mdev, enum mt76_rxq_id q) @@ -44,7 +44,7 @@ irqreturn_t mt7603_irq_handler(int irq, void *dev_instance) if (!test_bit(MT76_STATE_INITIALIZED, &dev->mt76.state)) return IRQ_NONE; - intr &= dev->irqmask; + intr &= dev->mt76.mmio.irqmask; if (intr & MT_INT_MAC_IRQ3) { u32 hwintr = mt76_rr(dev, MT_HW_INT_STATUS(3)); diff --git a/mt7603/init.c b/mt7603/init.c index 1767e618..d5c5573e 100644 --- a/mt7603/init.c +++ b/mt7603/init.c @@ -41,8 +41,6 @@ struct mt7603_dev *mt7603_alloc_device(struct device *pdev) mdev->dev = pdev; mdev->drv = &drv_ops; - spin_lock_init(&dev->irq_lock); - return dev; } diff --git a/mt7603/mac.c b/mt7603/mac.c index 54cfa539..8ecefb28 100644 --- a/mt7603/mac.c +++ b/mt7603/mac.c @@ -1130,7 +1130,7 @@ void mt7603_mac_stop(struct mt7603_dev *dev) static void mt7603_mac_watchdog_reset(struct mt7603_dev *dev) { int beacon_int = dev->beacon_int; - u32 mask = dev->irqmask; + u32 mask = dev->mt76.mmio.irqmask; int i; ieee80211_stop_queues(dev->mt76.hw); diff --git a/mt7603/mt7603.h b/mt7603/mt7603.h index f8684dee..9041f1b9 100644 --- a/mt7603/mt7603.h +++ b/mt7603/mt7603.h @@ -92,9 +92,6 @@ enum mt7603_reset_cause { struct mt7603_dev { struct mt76_dev mt76; /* must be first */ - u32 irqmask; - spinlock_t irq_lock; - u32 rxfilter; u8 vif_mask;