From bec1d86778b921dc3ae0ef3552236c4a01e3ee8a Mon Sep 17 00:00:00 2001 From: Bhadram Varka Date: Mon, 26 Feb 2024 11:19:49 +0530 Subject: [PATCH] nvethernet: fix build issues with safety Bug 4506095 Change-Id: Ia24590ab716d7f879ca5394b7a5512db072c4fdd Signed-off-by: Bhadram Varka Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3083506 Reviewed-by: Narayana Reddy P Reviewed-by: Srinivas Ramachandran GVS: Gerrit_Virtual_Submit --- drivers/net/ethernet/nvidia/nvethernet/ether_linux.c | 7 ------- drivers/net/ethernet/nvidia/nvethernet/sysfs.c | 4 ++-- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c b/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c index 4f6b81e9..92b53d23 100644 --- a/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c +++ b/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c @@ -5774,13 +5774,6 @@ static int ether_parse_dt(struct ether_priv_data *pdata) } } - /* Read MAC instance id */ - ret = of_property_read_u32(np, "nvidia,instance_id", &osi_core->instance_id); - if (ret != 0) { - dev_info(dev, "DT instance_id missing\n"); - return -EINVAL; - } - if (osi_dma->num_dma_chans != osi_core->num_mtl_queues) { dev_err(dev, "mismatch in numbers of DMA channel and MTL Q\n"); return -EINVAL; diff --git a/drivers/net/ethernet/nvidia/nvethernet/sysfs.c b/drivers/net/ethernet/nvidia/nvethernet/sysfs.c index 7560d54b..ebf758d9 100644 --- a/drivers/net/ethernet/nvidia/nvethernet/sysfs.c +++ b/drivers/net/ethernet/nvidia/nvethernet/sysfs.c @@ -2755,10 +2755,10 @@ static struct attribute *ether_sysfs_attrs_without_macsec[] = { &dev_attr_nvgro_stats.attr, &dev_attr_nvgro_dump.attr, #endif -#endif /* OSI_STRIPPED_LIB */ #ifdef HSI_SUPPORT &dev_attr_hsi_enable.attr, #endif +#endif /* OSI_STRIPPED_LIB */ NULL }; @@ -3353,9 +3353,9 @@ static void ether_remove_debugfs(struct ether_priv_data *pdata) int ether_sysfs_register(struct ether_priv_data *pdata) { struct device *dev = pdata->dev; + int ret = 0; #ifndef OSI_STRIPPED_LIB #ifdef CONFIG_DEBUG_FS - int ret = 0; if (debugfs_initialized()) { ret = ether_create_debugfs(pdata);