OSDN Git Service

net: ethernet: et131x: Remove redundant register read
authorMark Einon <mark.einon@gmail.com>
Fri, 17 Jul 2020 13:21:35 +0000 (14:21 +0100)
committerDavid S. Miller <davem@davemloft.net>
Sat, 18 Jul 2020 01:48:15 +0000 (18:48 -0700)
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: Mark Einon <mark.einon@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/agere/et131x.c

index 8806e1e..41f8821 100644 (file)
@@ -983,7 +983,6 @@ static void et1310_setup_device_for_multicast(struct et131x_adapter *adapter)
        }
 
        /* Write out the new hash to the device */
-       readl(&adapter->regs->global.pm_csr);
        if (!et1310_in_phy_coma(adapter)) {
                writel(hash1, &rxmac->multi_hash1);
                writel(hash2, &rxmac->multi_hash2);
@@ -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[5];
 
-       readl(&adapter->regs->global.pm_csr);
        if (!et1310_in_phy_coma(adapter)) {
                writel(uni_pf1, &rxmac->uni_pf_addr1);
                writel(uni_pf2, &rxmac->uni_pf_addr2);
@@ -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
                         * pressure register (bp req and bp xon/xoff)
                         */
-                       readl(&iomem->global.pm_csr);
                        if (!et1310_in_phy_coma(adapter))
                                writel(3, &iomem->txmac.bp_ctrl);
                }