Skip to content

Commit 0ddd83f

Browse files
can: m_can: remove support for custom bit timing
Since commit aee2b3c ("can: tcan4x5x: fix bittiming const, use common bittiming from m_can driver") there is no use of the device specific bit timing parameters (m_can_classdev::bit_timing and struct m_can_classdev::data_timing). This patch removes the support for custom bit timing from the driver, as the common bit timing works for all known IP core implementations. Cc: Chandrasekar Ramakrishnan <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Marc Kleine-Budde <[email protected]>
1 parent 9808dba commit 0ddd83f

File tree

2 files changed

+6
-21
lines changed

2 files changed

+6
-21
lines changed

drivers/net/can/m_can/m_can.c

+6-18
Original file line numberDiff line numberDiff line change
@@ -1440,32 +1440,20 @@ static int m_can_dev_setup(struct m_can_classdev *cdev)
14401440
case 30:
14411441
/* CAN_CTRLMODE_FD_NON_ISO is fixed with M_CAN IP v3.0.x */
14421442
can_set_static_ctrlmode(dev, CAN_CTRLMODE_FD_NON_ISO);
1443-
cdev->can.bittiming_const = cdev->bit_timing ?
1444-
cdev->bit_timing : &m_can_bittiming_const_30X;
1445-
1446-
cdev->can.data_bittiming_const = cdev->data_timing ?
1447-
cdev->data_timing :
1448-
&m_can_data_bittiming_const_30X;
1443+
cdev->can.bittiming_const = &m_can_bittiming_const_30X;
1444+
cdev->can.data_bittiming_const = &m_can_data_bittiming_const_30X;
14491445
break;
14501446
case 31:
14511447
/* CAN_CTRLMODE_FD_NON_ISO is fixed with M_CAN IP v3.1.x */
14521448
can_set_static_ctrlmode(dev, CAN_CTRLMODE_FD_NON_ISO);
1453-
cdev->can.bittiming_const = cdev->bit_timing ?
1454-
cdev->bit_timing : &m_can_bittiming_const_31X;
1455-
1456-
cdev->can.data_bittiming_const = cdev->data_timing ?
1457-
cdev->data_timing :
1458-
&m_can_data_bittiming_const_31X;
1449+
cdev->can.bittiming_const = &m_can_bittiming_const_31X;
1450+
cdev->can.data_bittiming_const = &m_can_data_bittiming_const_31X;
14591451
break;
14601452
case 32:
14611453
case 33:
14621454
/* Support both MCAN version v3.2.x and v3.3.0 */
1463-
cdev->can.bittiming_const = cdev->bit_timing ?
1464-
cdev->bit_timing : &m_can_bittiming_const_31X;
1465-
1466-
cdev->can.data_bittiming_const = cdev->data_timing ?
1467-
cdev->data_timing :
1468-
&m_can_data_bittiming_const_31X;
1455+
cdev->can.bittiming_const = &m_can_bittiming_const_31X;
1456+
cdev->can.data_bittiming_const = &m_can_data_bittiming_const_31X;
14691457

14701458
cdev->can.ctrlmode_supported |=
14711459
(m_can_niso_supported(cdev) ?

drivers/net/can/m_can/m_can.h

-3
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,6 @@ struct m_can_classdev {
8585
struct sk_buff *tx_skb;
8686
struct phy *transceiver;
8787

88-
struct can_bittiming_const *bit_timing;
89-
struct can_bittiming_const *data_timing;
90-
9188
struct m_can_ops *ops;
9289

9390
int version;

0 commit comments

Comments
 (0)