Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

net: ethernet: mediatek: Rename MTK_QMTK_INT_STATUS to MTK_QDMA_INT_STATUS

Currently all QDMA registers are named "MTK_QDMA_foo" in this driver
with one exception: MTK_QMTK_INT_STATUS. This patch renames
MTK_QMTK_INT_STATUS to MTK_QDMA_INT_STATUS so that all macros follow
this rule.

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: René van Dorst <opensource@vdorst.com>
Cc: Daniel Golle <daniel@makrotopia.org>
Cc: Sean Wang <sean.wang@mediatek.com>
Cc: John Crispin <john@phrozen.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Stefan Roese and committed by
David S. Miller
45487403 5be4480d

+5 -5
+4 -4
drivers/net/ethernet/mediatek/mtk_eth_soc.c
··· 1122 1122 int tx_done = 0; 1123 1123 1124 1124 mtk_handle_status_irq(eth); 1125 - mtk_w32(eth, MTK_TX_DONE_INT, MTK_QMTK_INT_STATUS); 1125 + mtk_w32(eth, MTK_TX_DONE_INT, MTK_QDMA_INT_STATUS); 1126 1126 tx_done = mtk_poll_tx(eth, budget); 1127 1127 1128 1128 if (unlikely(netif_msg_intr(eth))) { 1129 - status = mtk_r32(eth, MTK_QMTK_INT_STATUS); 1129 + status = mtk_r32(eth, MTK_QDMA_INT_STATUS); 1130 1130 mask = mtk_r32(eth, MTK_QDMA_INT_MASK); 1131 1131 dev_info(eth->dev, 1132 1132 "done tx %d, intr 0x%08x/0x%x\n", ··· 1136 1136 if (tx_done == budget) 1137 1137 return budget; 1138 1138 1139 - status = mtk_r32(eth, MTK_QMTK_INT_STATUS); 1139 + status = mtk_r32(eth, MTK_QDMA_INT_STATUS); 1140 1140 if (status & MTK_TX_DONE_INT) 1141 1141 return budget; 1142 1142 ··· 1747 1747 mtk_handle_irq_rx(irq, _eth); 1748 1748 } 1749 1749 if (mtk_r32(eth, MTK_QDMA_INT_MASK) & MTK_TX_DONE_INT) { 1750 - if (mtk_r32(eth, MTK_QMTK_INT_STATUS) & MTK_TX_DONE_INT) 1750 + if (mtk_r32(eth, MTK_QDMA_INT_STATUS) & MTK_TX_DONE_INT) 1751 1751 mtk_handle_irq_tx(irq, _eth); 1752 1752 } 1753 1753
+1 -1
drivers/net/ethernet/mediatek/mtk_eth_soc.h
··· 212 212 #define FC_THRES_MIN 0x4444 213 213 214 214 /* QDMA Interrupt Status Register */ 215 - #define MTK_QMTK_INT_STATUS 0x1A18 215 + #define MTK_QDMA_INT_STATUS 0x1A18 216 216 #define MTK_RX_DONE_DLY BIT(30) 217 217 #define MTK_RX_DONE_INT3 BIT(19) 218 218 #define MTK_RX_DONE_INT2 BIT(18)