diff options
| author | Jarkko Nikula <jarkko.nikula@linux.intel.com> | 2022-05-12 15:41:44 +0300 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2022-05-14 21:53:01 +0300 |
| commit | d6da7881020f9b37edb80ada12ce9b50b9232dc1 (patch) | |
| tree | b8d4c42c1d8983078b61761962c7a167d43b055e /drivers/net/can/m_can/m_can.h | |
| parent | 14ea4a470494528c7e88da5c4116c24eb027059f (diff) | |
| download | linux-d6da7881020f9b37edb80ada12ce9b50b9232dc1.tar.xz | |
can: m_can: remove support for custom bit timing, take #2
Now when Intel Elkhart Lake uses again common bit timing and there are
no other users for custom bit timing, we can bring back the changes
done by the commit 0ddd83fbebbc ("can: m_can: remove support for
custom bit timing").
This effectively reverts commit ea768b2ffec6 ("Revert "can: m_can:
remove support for custom bit timing"") while taking into account
commit ea22ba40debe ("can: m_can: make custom bittiming fields const")
and commit 7d4a101c0bd3 ("can: dev: add sanity check in
can_set_static_ctrlmode()").
Link: https://lore.kernel.org/all/20220512124144.536850-2-jarkko.nikula@linux.intel.com
Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'drivers/net/can/m_can/m_can.h')
| -rw-r--r-- | drivers/net/can/m_can/m_can.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/can/m_can/m_can.h b/drivers/net/can/m_can/m_can.h index 2c5d40997168..d18b515e6ccc 100644 --- a/drivers/net/can/m_can/m_can.h +++ b/drivers/net/can/m_can/m_can.h @@ -85,9 +85,6 @@ struct m_can_classdev { struct sk_buff *tx_skb; struct phy *transceiver; - const struct can_bittiming_const *bit_timing; - const struct can_bittiming_const *data_timing; - struct m_can_ops *ops; int version; |