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

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>

authored by

Sven Van Asbroeck and committed by
Jakub Kicinski
c31799ba da43f0aa

+4 -9
+4 -9
drivers/net/ethernet/microchip/lan743x_main.c
··· 140 140 return result; 141 141 } 142 142 143 - static void lan743x_intr_software_isr(void *context) 143 + static void lan743x_intr_software_isr(struct lan743x_adapter *adapter) 144 144 { 145 - struct lan743x_adapter *adapter = context; 146 145 struct lan743x_intr *intr = &adapter->intr; 147 - u32 int_sts; 148 146 149 - int_sts = lan743x_csr_read(adapter, INT_STS); 150 - if (int_sts & INT_BIT_SW_GP_) { 151 - /* disable the interrupt to prevent repeated re-triggering */ 152 - lan743x_csr_write(adapter, INT_EN_CLR, INT_BIT_SW_GP_); 153 - intr->software_isr_flag = 1; 154 - } 147 + /* disable the interrupt to prevent repeated re-triggering */ 148 + lan743x_csr_write(adapter, INT_EN_CLR, INT_BIT_SW_GP_); 149 + intr->software_isr_flag = 1; 155 150 } 156 151 157 152 static void lan743x_tx_isr(void *context, u32 int_sts, u32 flags)