| Message ID | 20200922015615.19212-1-song.bao.hua@hisilicon.com |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | net: allwinner: remove redundant irqsave and irqrestore in hardIRQ | expand |
On Tue, Sep 22, 2020 at 01:56:15PM +1200, Barry Song wrote: > The comment "holders of db->lock must always block IRQs" and related > code to do irqsave and irqrestore don't make sense since we are in a > IRQ-disabled hardIRQ context. > > Cc: Maxime Ripard <mripard@kernel.org> > Cc: Chen-Yu Tsai <wens@csie.org> > Signed-off-by: Barry Song <song.bao.hua@hisilicon.com> Acked-by: Maxime Ripard <mripard@kernel.org> Thanks! Maxime
From: Barry Song <song.bao.hua@hisilicon.com> Date: Tue, 22 Sep 2020 13:56:15 +1200 > The comment "holders of db->lock must always block IRQs" and related > code to do irqsave and irqrestore don't make sense since we are in a > IRQ-disabled hardIRQ context. > > Cc: Maxime Ripard <mripard@kernel.org> > Cc: Chen-Yu Tsai <wens@csie.org> > Signed-off-by: Barry Song <song.bao.hua@hisilicon.com> Applied to net-next, thanks.
diff --git a/drivers/net/ethernet/allwinner/sun4i-emac.c b/drivers/net/ethernet/allwinner/sun4i-emac.c index b3b8a8010142..862ea44beea7 100644 --- a/drivers/net/ethernet/allwinner/sun4i-emac.c +++ b/drivers/net/ethernet/allwinner/sun4i-emac.c @@ -640,13 +640,11 @@ static irqreturn_t emac_interrupt(int irq, void *dev_id) struct net_device *dev = dev_id; struct emac_board_info *db = netdev_priv(dev); int int_status; - unsigned long flags; unsigned int reg_val; /* A real interrupt coming */ - /* holders of db->lock must always block IRQs */ - spin_lock_irqsave(&db->lock, flags); + spin_lock(&db->lock); /* Disable all interrupts */ writel(0, db->membase + EMAC_INT_CTL_REG); @@ -680,7 +678,7 @@ static irqreturn_t emac_interrupt(int irq, void *dev_id) reg_val |= (0xf << 0) | (0x01 << 8); writel(reg_val, db->membase + EMAC_INT_CTL_REG); } - spin_unlock_irqrestore(&db->lock, flags); + spin_unlock(&db->lock); return IRQ_HANDLED; }
The comment "holders of db->lock must always block IRQs" and related code to do irqsave and irqrestore don't make sense since we are in a IRQ-disabled hardIRQ context. Cc: Maxime Ripard <mripard@kernel.org> Cc: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Barry Song <song.bao.hua@hisilicon.com> --- drivers/net/ethernet/allwinner/sun4i-emac.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)