OSDN Git Service

can: mcp251xfd: mcp25xxfd_ring_alloc(): add define instead open coding the maximum...
authorMarc Kleine-Budde <mkl@pengutronix.de>
Thu, 26 Nov 2020 13:21:40 +0000 (14:21 +0100)
committerMarc Kleine-Budde <mkl@pengutronix.de>
Sun, 29 Nov 2020 20:19:12 +0000 (21:19 +0100)
This patch add a define for the maximum number of RX objects instead of open
coding it.

Link: https://lore.kernel.org/r/20201126132144.351154-2-mkl@pengutronix.de
Tested-by: Thomas Kopp <thomas.kopp@microchip.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c
drivers/net/can/spi/mcp251xfd/mcp251xfd.h

index d0f2f5c..476a2e4 100644 (file)
@@ -416,7 +416,8 @@ static int mcp251xfd_ring_alloc(struct mcp251xfd_priv *priv)
                int rx_obj_num;
 
                rx_obj_num = ram_free / rx_obj_size;
-               rx_obj_num = min(1 << (fls(rx_obj_num) - 1), 32);
+               rx_obj_num = min(1 << (fls(rx_obj_num) - 1),
+                                MCP251XFD_RX_OBJ_NUM_MAX);
 
                rx_ring = kzalloc(sizeof(*rx_ring) + rx_obj_size * rx_obj_num,
                                  GFP_KERNEL);
index fa1246e..c20c97d 100644 (file)
  * FIFO setup: tef: 8*12 bytes = 96 bytes, tx: 8*16 bytes = 128 bytes
  * FIFO setup: tef: 4*12 bytes = 48 bytes, tx: 4*72 bytes = 288 bytes
  */
+#define MCP251XFD_RX_OBJ_NUM_MAX 32
 #define MCP251XFD_TX_OBJ_NUM_CAN 8
 #define MCP251XFD_TX_OBJ_NUM_CANFD 4