| Message ID | 1593608931-3718-3-git-send-email-claudiu.beznea@microchip.com |
|---|---|
| State | Changes Requested |
| Delegated to: | David Miller |
| Headers | show |
| Series | net: macb: few code cleanups | expand |
From: Claudiu Beznea <claudiu.beznea@microchip.com> Date: Wed, 1 Jul 2020 16:08:49 +0300 > @@ -3482,8 +3482,6 @@ static void macb_probe_queues(void __iomem *mem, > unsigned int *queue_mask, ... > + *num_queues = hweight_long(*queue_mask); queue_mask is not a long, it is an unsinged int, therefore hweight32() is probably more appropriate.
diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c index 1bc2810f3dc4..a84fb0ec53f0 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -3482,8 +3482,6 @@ static void macb_probe_queues(void __iomem *mem, unsigned int *queue_mask, unsigned int *num_queues) { - unsigned int hw_q; - *queue_mask = 0x1; *num_queues = 1; @@ -3498,10 +3496,7 @@ static void macb_probe_queues(void __iomem *mem, /* bit 0 is never set but queue 0 always exists */ *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)) - (*num_queues)++; + *num_queues = hweight_long(*queue_mask); } static int macb_clk_init(struct platform_device *pdev, struct clk **pclk,
Use hweight_long() to count set bits in queue_mask. Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com> --- drivers/net/ethernet/cadence/macb_main.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)