From bb37b5d6668f56fa28532f085be2cdda95e4bb88 Mon Sep 17 00:00:00 2001 From: Manish Bhardwaj Date: Wed, 5 Oct 2022 13:16:21 +0530 Subject: [PATCH] nvidia-oot: fix mttcan driver compilaiton error. Using this patch we are fixing below compilation error of mttcan driver with stable kernel. nvidia-oot/drivers/net/can/mttcan/native/m_ttcan_linux.c:620:3: error: implicit declaration of function _can_led_event_ [-Werror=implicit-function-declaration] can_led_event(dev, CAN_LED_EVENT_TX); Bug 3767126 Signed-off-by: Manish Bhardwaj Change-Id: Ic7fa91a34b59f165ce689ad956f1c3779ef13f9a Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/2787166 Reviewed-by: Laxman Dewangan Reviewed-by: Sachin Nikam GVS: Gerrit_Virtual_Submit --- drivers/net/can/mttcan/native/m_ttcan_linux.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/net/can/mttcan/native/m_ttcan_linux.c b/drivers/net/can/mttcan/native/m_ttcan_linux.c index 1deabdd8..47f2e4a4 100644 --- a/drivers/net/can/mttcan/native/m_ttcan_linux.c +++ b/drivers/net/can/mttcan/native/m_ttcan_linux.c @@ -617,7 +617,9 @@ static void mttcan_tx_complete(struct net_device *dev) while (completed_tx) { msg_no = ffs(completed_tx) - 1; can_get_echo_skb(dev, msg_no, NULL); +#if LINUX_VERSION_CODE < KERNEL_VERSION(6,0,0) can_led_event(dev, CAN_LED_EVENT_TX); +#endif clear_bit(msg_no, &ttcan->tx_object); stats->tx_packets++; stats->tx_bytes += ttcan->tx_buf_dlc[msg_no]; @@ -1303,7 +1305,9 @@ static int mttcan_open(struct net_device *dev) } napi_enable(&priv->napi); +#if LINUX_VERSION_CODE < KERNEL_VERSION(6,0,0) can_led_event(dev, CAN_LED_EVENT_OPEN); +#endif mttcan_start(dev); netif_start_queue(dev); @@ -1330,7 +1334,9 @@ static int mttcan_close(struct net_device *dev) mttcan_power_down(dev); mttcan_pm_runtime_put_sync(priv); +#if LINUX_VERSION_CODE < KERNEL_VERSION(6,0,0) can_led_event(dev, CAN_LED_EVENT_STOP); +#endif return 0; } @@ -1529,8 +1535,10 @@ static int register_mttcan_dev(struct net_device *dev) dev->netdev_ops = &mttcan_netdev_ops; err = register_candev(dev); +#if LINUX_VERSION_CODE < KERNEL_VERSION(6,0,0) if (!err) devm_can_led_init(dev); +#endif return err; }