lan743x: clean up software_isr function

For no apparent reason, this function reads the INT_STS register, and
checks if the software interrupt bit is set. These things have already
been carried out by this function's only caller.

Clean up by removing the redundant code.

Tested-by: Sven Van Asbroeck <thesven73@gmail.com> # lan7430
Signed-off-by: Sven Van Asbroeck <thesven73@gmail.com>
Link: https://lore.kernel.org/r/20201123191529.14908-1-TheSven73@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/microchip/lan743x_main.c b/drivers/net/ethernet/microchip/lan743x_main.c
index 794510cba51fb7676d28dd4250ea85d8c6815d14..38ef079bb600c5947855c370e048f7ac6689868e 100644 (file)
--- a/drivers/net/ethernet/microchip/lan743x_main.c
+++ b/drivers/net/ethernet/microchip/lan743x_main.c
@@ -140,18 +140,13 @@ clean_up:
        return result;
 }
 
-static void lan743x_intr_software_isr(void *context)
+static void lan743x_intr_software_isr(struct lan743x_adapter *adapter)
 {
-       struct lan743x_adapter *adapter = context;
        struct lan743x_intr *intr = &adapter->intr;
-       u32 int_sts;
 
-       int_sts = lan743x_csr_read(adapter, INT_STS);
-       if (int_sts & INT_BIT_SW_GP_) {
-               /* disable the interrupt to prevent repeated re-triggering */
-               lan743x_csr_write(adapter, INT_EN_CLR, INT_BIT_SW_GP_);
-               intr->software_isr_flag = 1;
-       }
+       /* disable the interrupt to prevent repeated re-triggering */
+       lan743x_csr_write(adapter, INT_EN_CLR, INT_BIT_SW_GP_);
+       intr->software_isr_flag = 1;
 }
 
 static void lan743x_tx_isr(void *context, u32 int_sts, u32 flags)