From 9655b8c6b0a345953f10191fea0b62d989cd4671 Mon Sep 17 00:00:00 2001 From: Jon Hunter Date: Mon, 17 Jul 2023 15:07:20 +0100 Subject: [PATCH] net: nvethernet: Fix CONFIG_TEGRA_NVPPS not defined warning Compiling the nvethernet driver without the ccflag CONFIG_TEGRA_NVPPS defined generates the following warning ... drivers/net/ethernet/nvidia/nvethernet/ether_linux.c:2936:5: warning: "CONFIG_TEGRA_NVPPS" is not defined, evaluates to 0 [-Wundef] 2936 | #if CONFIG_TEGRA_NVPPS | ^~~~~~~~~~~~~~~~~~ Fix this by using '#ifdef' to determine if CONFIG_TEGRA_NVPPS is defined instead of '#if'. Bug 4190030 Change-Id: Id1523de6f9ef9f4c72669584efb77ffd9ddf20f3 Signed-off-by: Jon Hunter Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/2938375 Reviewed-by: Revanth Kumar Uppala GVS: Gerrit_Virtual_Submit --- drivers/net/ethernet/nvidia/nvethernet/ether_linux.c | 2 +- drivers/net/ethernet/nvidia/nvethernet/ptp.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c b/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c index 8044d9ce..50198026 100644 --- a/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c +++ b/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c @@ -2933,7 +2933,7 @@ static int ether_close(struct net_device *ndev) /* TODO: purge the queues */ #endif -#if CONFIG_TEGRA_NVPPS +#ifdef CONFIG_TEGRA_NVPPS /* Unregister broadcasting MAC timestamp to clients */ tegra_unregister_hwtime_source(ndev); #endif diff --git a/drivers/net/ethernet/nvidia/nvethernet/ptp.c b/drivers/net/ethernet/nvidia/nvethernet/ptp.c index 762a1ba7..0472350c 100644 --- a/drivers/net/ethernet/nvidia/nvethernet/ptp.c +++ b/drivers/net/ethernet/nvidia/nvethernet/ptp.c @@ -395,7 +395,7 @@ int ether_handle_hwtstamp_ioctl(struct ether_priv_data *pdata, { struct osi_core_priv_data *osi_core = pdata->osi_core; struct osi_dma_priv_data *osi_dma = pdata->osi_dma; -#if CONFIG_TEGRA_NVPPS +#ifdef CONFIG_TEGRA_NVPPS struct net_device *ndev = pdata->ndev; #endif struct osi_ioctl ioctl_data = {}; @@ -598,7 +598,7 @@ int ether_handle_hwtstamp_ioctl(struct ether_priv_data *pdata, dev_err(pdata->dev, "Failure to enable CONFIG_PTP\n"); return -EFAULT; } -#if CONFIG_TEGRA_NVPPS +#ifdef CONFIG_TEGRA_NVPPS /* Register broadcasting MAC timestamp to clients */ tegra_register_hwtime_source(ether_get_hw_time, ndev); #endif