can: dev: move struct data_bittiming_params to linux/can/bittiming.h

In commit b803c4a4f788 ("can: dev: add struct data_bittiming_params to
group FD parameters"), struct data_bittiming_params was put into
linux/can/dev.h.

This structure being a collection of bittiming parameters, on second
thought, bittiming.h is actually a better location. This way, users of
struct data_bittiming_params will not have to forcefully include
linux/can/dev.h thus removing some complexity and reducing the risk of
circular dependencies in headers.

Move struct data_bittiming_params from linux/can/dev.h to
linux/can/bittiming.h.

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

diff --git a/include/linux/can/bittiming.h b/include/linux/can/bittiming.h
index 5dfdbb63b1d54f3dc02170b10b73dbb9c2242851..6572ec1712ca2df8db7fe1453ae5a4d5699712b1 100644 (file)
--- a/include/linux/can/bittiming.h
+++ b/include/linux/can/bittiming.h
@@ -114,6 +114,17 @@ struct can_tdc_const {
        u32 tdcf_max;
 };
 
+struct data_bittiming_params {
+       const struct can_bittiming_const *data_bittiming_const;
+       struct can_bittiming data_bittiming;
+       const struct can_tdc_const *tdc_const;
+       struct can_tdc tdc;
+       const u32 *data_bitrate_const;
+       unsigned int data_bitrate_const_cnt;
+       int (*do_set_data_bittiming)(struct net_device *dev);
+       int (*do_get_auto_tdcv)(const struct net_device *dev, u32 *tdcv);
+};
+
 #ifdef CONFIG_CAN_CALC_BITTIMING
 int can_calc_bittiming(const struct net_device *dev, struct can_bittiming *bt,
                       const struct can_bittiming_const *btc, struct netlink_ext_ack *extack);

diff --git a/include/linux/can/dev.h b/include/linux/can/dev.h
index 3354f70ed2c684d7d482549560d4cb5838cbebd5..c2fe956ab7761f45a87e77131bb57e9d5d51dd7f 100644 (file)
--- a/include/linux/can/dev.h
+++ b/include/linux/can/dev.h
@@ -38,17 +38,6 @@ enum can_termination_gpio {
        CAN_TERMINATION_GPIO_MAX,
 };
 
-struct data_bittiming_params {
-       const struct can_bittiming_const *data_bittiming_const;
-       struct can_bittiming data_bittiming;
-       const struct can_tdc_const *tdc_const;
-       struct can_tdc tdc;
-       const u32 *data_bitrate_const;
-       unsigned int data_bitrate_const_cnt;
-       int (*do_set_data_bittiming)(struct net_device *dev);
-       int (*do_get_auto_tdcv)(const struct net_device *dev, u32 *tdcv);
-};
-
 /*
  * CAN common private data
  */