From: Sven Van Asbroeck <[email protected]> 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 <[email protected]> # lan7430 Signed-off-by: Sven Van Asbroeck <[email protected]> --- Tree: git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git # f9e425e99b07 To: Bryan Whitehead <[email protected]> To: Jakub Kicinski <[email protected]> To: "David S. Miller" <[email protected]> Cc: Andrew Lunn <[email protected]> Cc: Microchip Linux Driver Support <[email protected]> Cc: [email protected] Cc: [email protected] drivers/net/ethernet/microchip/lan743x_main.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/drivers/net/ethernet/microchip/lan743x_main.c b/drivers/net/ethernet/microchip/lan743x_main.c index 87b6c59a1e03..bdc80098c240 100644 --- a/drivers/net/ethernet/microchip/lan743x_main.c +++ b/drivers/net/ethernet/microchip/lan743x_main.c @@ -140,18 +140,13 @@ static int lan743x_csr_init(struct lan743x_adapter *adapter) 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) -- 2.17.1
