43 lines
1.5 KiB
Diff
43 lines
1.5 KiB
Diff
|
From 31428406bf4b9da2a322ae947096414ff0489fb5 Mon Sep 17 00:00:00 2001
|
||
|
|
From: John Crispin <john@phrozen.org>
|
||
|
|
Date: Tue, 3 May 2016 03:57:01 +0200
|
||
|
|
Subject: [PATCH 093/102] net-next: mediatek: remove superfluous register
|
||
|
|
reads
|
||
|
|
|
||
|
|
The driver was originally written for MIPS based SoC. These required the
|
||
|
|
IRQ mask register to be read after writing it to ensure that the content
|
||
|
|
was actually applied. As this version only works on ARM based SoC, we can
|
||
|
|
safely remove the 2 reads as they ware not required.
|
||
|
|
|
||
|
|
Signed-off-by: Sean Wang <keyhaede@gmail.com>
|
||
|
|
Signed-off-by: John Crispin <john@phrozen.org>
|
||
|
|
---
|
||
|
|
drivers/net/ethernet/mediatek/mtk_eth_soc.c | 4 ----
|
||
|
|
1 file changed, 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
||
|
|
index a569c32..6a9fbde 100644
|
||
|
|
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
||
|
|
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
||
|
|
@@ -335,8 +335,6 @@ static inline void mtk_irq_disable(struct mtk_eth *eth, u32 mask)
|
||
|
|
|
||
|
|
val = mtk_r32(eth, MTK_QDMA_INT_MASK);
|
||
|
|
mtk_w32(eth, val & ~mask, MTK_QDMA_INT_MASK);
|
||
|
|
- /* flush write */
|
||
|
|
- mtk_r32(eth, MTK_QDMA_INT_MASK);
|
||
|
|
}
|
||
|
|
|
||
|
|
static inline void mtk_irq_enable(struct mtk_eth *eth, u32 mask)
|
||
|
|
@@ -345,8 +343,6 @@ static inline void mtk_irq_enable(struct mtk_eth *eth, u32 mask)
|
||
|
|
|
||
|
|
val = mtk_r32(eth, MTK_QDMA_INT_MASK);
|
||
|
|
mtk_w32(eth, val | mask, MTK_QDMA_INT_MASK);
|
||
|
|
- /* flush write */
|
||
|
|
- mtk_r32(eth, MTK_QDMA_INT_MASK);
|
||
|
|
}
|
||
|
|
|
||
|
|
static int mtk_set_mac_address(struct net_device *dev, void *p)
|
||
|
|
--
|
||
|
|
1.7.10.4
|
||
|
|
|