From 16d1e13a3b38a6583578cfcefac506b70c795a49 Mon Sep 17 00:00:00 2001 From: Manish Bhardwaj Date: Thu, 29 Jun 2023 09:51:56 +0530 Subject: [PATCH] mttcan: fix compilation error for android 1. nvidia-oot/drivers/net/can/mttcan/native/../ include/m_ttcan_linux.h:35:10: fatal error: 'linux/tegra_prod.h' file not found ^~~~~~~~~~~~~~~~~~~~ 1 error generated. 2. nvidia-oot/drivers/net/can/mttcan/hal/m_ttcan.c:330:6: warning: unused variable _tdcr_reg_ [-Wunused-variable] 330 | u32 tdcr_reg; | ^~~~~~~~ Bug 4174549 Signed-off-by: Manish Bhardwaj Change-Id: I57ae8d1234745996fb1277c64c632d2d1026a870 Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/2928348 Reviewed-by: Laxman Dewangan Reviewed-by: Bruce Xu Tested-by: Bruce Xu --- drivers/net/can/mttcan/hal/m_ttcan.c | 2 ++ drivers/net/can/mttcan/include/m_ttcan_linux.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/can/mttcan/hal/m_ttcan.c b/drivers/net/can/mttcan/hal/m_ttcan.c index c2988efb..bb08e47c 100644 --- a/drivers/net/can/mttcan/hal/m_ttcan.c +++ b/drivers/net/can/mttcan/hal/m_ttcan.c @@ -327,7 +327,9 @@ int ttcan_set_bitrate(struct mttcan_priv *priv) u32 cccr_reg; u32 nbtp_reg; u32 dbtp_reg; +#if KERNEL_VERSION(5, 16, 0) < LINUX_VERSION_CODE u32 tdcr_reg; +#endif nbtp_reg = ((ttcan->bt_config.nominal.phase_seg2 - 1) << MTT_NBTP_NTSEG2_SHIFT) & MTT_NBTP_NTSEG2_MASK; diff --git a/drivers/net/can/mttcan/include/m_ttcan_linux.h b/drivers/net/can/mttcan/include/m_ttcan_linux.h index 9fa451e0..8571de47 100644 --- a/drivers/net/can/mttcan/include/m_ttcan_linux.h +++ b/drivers/net/can/mttcan/include/m_ttcan_linux.h @@ -32,7 +32,7 @@ #include #include #if KERNEL_VERSION(5, 16, 0) >= LINUX_VERSION_CODE -#include +#include #endif #include #include