Commit 11f3c1f5 authored by Mark Einon's avatar Mark Einon Committed by David S. Miller

net: ethernet: et131x: Remove redundant register read

Following the removal of an unused variable assignment (remove
unused variable 'pm_csr') the associated register read can also go,
as the read also occurs in the subsequent et1310_in_phy_coma()
call.
Signed-off-by: default avatarMark Einon <mark.einon@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent eacc43d2
...@@ -983,7 +983,6 @@ static void et1310_setup_device_for_multicast(struct et131x_adapter *adapter) ...@@ -983,7 +983,6 @@ static void et1310_setup_device_for_multicast(struct et131x_adapter *adapter)
} }
/* Write out the new hash to the device */ /* Write out the new hash to the device */
readl(&adapter->regs->global.pm_csr);
if (!et1310_in_phy_coma(adapter)) { if (!et1310_in_phy_coma(adapter)) {
writel(hash1, &rxmac->multi_hash1); writel(hash1, &rxmac->multi_hash1);
writel(hash2, &rxmac->multi_hash2); writel(hash2, &rxmac->multi_hash2);
...@@ -1023,7 +1022,6 @@ static void et1310_setup_device_for_unicast(struct et131x_adapter *adapter) ...@@ -1023,7 +1022,6 @@ static void et1310_setup_device_for_unicast(struct et131x_adapter *adapter)
(adapter->addr[4] << ET_RX_UNI_PF_ADDR1_5_SHIFT) | (adapter->addr[4] << ET_RX_UNI_PF_ADDR1_5_SHIFT) |
adapter->addr[5]; adapter->addr[5];
readl(&adapter->regs->global.pm_csr);
if (!et1310_in_phy_coma(adapter)) { if (!et1310_in_phy_coma(adapter)) {
writel(uni_pf1, &rxmac->uni_pf_addr1); writel(uni_pf1, &rxmac->uni_pf_addr1);
writel(uni_pf2, &rxmac->uni_pf_addr2); writel(uni_pf2, &rxmac->uni_pf_addr2);
...@@ -3444,7 +3442,6 @@ static irqreturn_t et131x_isr(int irq, void *dev_id) ...@@ -3444,7 +3442,6 @@ static irqreturn_t et131x_isr(int irq, void *dev_id)
/* Tell the device to send a pause packet via the back /* Tell the device to send a pause packet via the back
* pressure register (bp req and bp xon/xoff) * pressure register (bp req and bp xon/xoff)
*/ */
readl(&iomem->global.pm_csr);
if (!et1310_in_phy_coma(adapter)) if (!et1310_in_phy_coma(adapter))
writel(3, &iomem->txmac.bp_ctrl); writel(3, &iomem->txmac.bp_ctrl);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment