can: netlink: add can_bitrate_const_fill_info()

Add can_bitrate_const_fill_info() to factorise the logic when filling
the bitrate constant information for Classical CAN and CAN FD. This
function will be reused later on for CAN XL.

Signed-off-by: Vincent Mailhol <mailhol@kernel.org>
Link: https://patch.msgid.link/20250923-canxl-netlink-prep-v4-16-e720d28f66fe@kernel.org
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

diff --git a/drivers/net/can/dev/netlink.c b/drivers/net/can/dev/netlink.c
index fa922a61f75afd18c587f144b6bb2a17be7f26da..9794f283ed588e37fbc9a189cb54c6965960d436 100644 (file)
--- a/drivers/net/can/dev/netlink.c
+++ b/drivers/net/can/dev/netlink.c
@@ -576,6 +576,15 @@ static int can_bittiming_const_fill_info(struct sk_buff *skb,
                        sizeof(*bittiming_const), bittiming_const);
 }
 
+static int can_bitrate_const_fill_info(struct sk_buff *skb,
+                                      int ifla_can_bitrate_const,
+                                      const u32 *bitrate_const, unsigned int cnt)
+{
+       return bitrate_const &&
+               nla_put(skb, ifla_can_bitrate_const,
+                       sizeof(*bitrate_const) * cnt, bitrate_const);
+}
+
 static int can_tdc_fill_info(struct sk_buff *skb, const struct net_device *dev)
 {
        struct nlattr *nest;
@@ -686,17 +695,13 @@ static int can_fill_info(struct sk_buff *skb, const struct net_device *dev)
                      priv->termination_const_cnt,
                      priv->termination_const))) ||
 
-           (priv->bitrate_const &&
-            nla_put(skb, IFLA_CAN_BITRATE_CONST,
-                    sizeof(*priv->bitrate_const) *
-                    priv->bitrate_const_cnt,
-                    priv->bitrate_const)) ||
-
-           (priv->fd.data_bitrate_const &&
-            nla_put(skb, IFLA_CAN_DATA_BITRATE_CONST,
-                    sizeof(*priv->fd.data_bitrate_const) *
-                    priv->fd.data_bitrate_const_cnt,
-                    priv->fd.data_bitrate_const)) ||
+           can_bitrate_const_fill_info(skb, IFLA_CAN_BITRATE_CONST,
+                                       priv->bitrate_const,
+                                       priv->bitrate_const_cnt) ||
+
+           can_bitrate_const_fill_info(skb, IFLA_CAN_DATA_BITRATE_CONST,
+                                       priv->fd.data_bitrate_const,
+                                       priv->fd.data_bitrate_const_cnt) ||
 
            (nla_put(skb, IFLA_CAN_BITRATE_MAX,
                     sizeof(priv->bitrate_max),