From: Claudiu Beznea Date: Thu, 2 Jul 2020 09:05:58 +0000 (+0300) Subject: net: macb: do not set again bit 0 of queue_mask X-Git-Tag: v5.15~3197^2~357^2~3 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fec371f624632bfa6ae4374fdb6f885f9961c42d;p=platform%2Fkernel%2Flinux-starfive.git net: macb: do not set again bit 0 of queue_mask Bit 0 of queue_mask is set at the beginning of macb_probe_queues() function. Do not set it again after reading DGFG6 but instead use "|=" operator. Signed-off-by: Claudiu Beznea Signed-off-by: David S. Miller --- diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c index 52582e8..1bc2810 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -3497,9 +3497,7 @@ static void macb_probe_queues(void __iomem *mem, return; /* bit 0 is never set but queue 0 always exists */ - *queue_mask = readl_relaxed(mem + GEM_DCFG6) & 0xff; - - *queue_mask |= 0x1; + *queue_mask |= readl_relaxed(mem + GEM_DCFG6) & 0xff; for (hw_q = 1; hw_q < MACB_MAX_QUEUES; ++hw_q) if (*queue_mask & (1 << hw_q))