nv-tegra-mirror/linux-nv-oot
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nv-oot.git synced 2025-12-22 17:25:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

nvethernet: fix build issues with safety

Browse Source 
Bug 4506095

Change-Id: Ia24590ab716d7f879ca5394b7a5512db072c4fdd
Signed-off-by: Bhadram Varka <vbhadram@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3083506
Reviewed-by: Narayana Reddy P <narayanr@nvidia.com>
Reviewed-by: Srinivas Ramachandran <srinivasra@nvidia.com>
GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
This commit is contained in:
Bhadram Varka
2024-02-26 11:19:49 +05:30
committed by mobile promotions
parent 725b8aacf1
commit bec1d86778
2 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/net/ethernet/nvidia/nvethernet/ether_linux.c
View File

@@ -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) { if (osi_dma->num_dma_chans != osi_core->num_mtl_queues) {
dev_err(dev, "mismatch in numbers of DMA channel and MTL Q\n"); dev_err(dev, "mismatch in numbers of DMA channel and MTL Q\n");
return -EINVAL; return -EINVAL;

4
drivers/net/ethernet/nvidia/nvethernet/sysfs.c
View File

@@ -2755,10 +2755,10 @@ static struct attribute *ether_sysfs_attrs_without_macsec[] = {
&dev_attr_nvgro_stats.attr, &dev_attr_nvgro_stats.attr,
&dev_attr_nvgro_dump.attr, &dev_attr_nvgro_dump.attr,
#endif #endif
#endif /* OSI_STRIPPED_LIB */
#ifdef HSI_SUPPORT #ifdef HSI_SUPPORT
&dev_attr_hsi_enable.attr, &dev_attr_hsi_enable.attr,
#endif #endif
#endif /* OSI_STRIPPED_LIB */
NULL NULL
}; };
@@ -3353,9 +3353,9 @@ static void ether_remove_debugfs(struct ether_priv_data *pdata)
int ether_sysfs_register(struct ether_priv_data *pdata) int ether_sysfs_register(struct ether_priv_data *pdata)
{ {
struct device *dev = pdata->dev; struct device *dev = pdata->dev;
int ret = 0;
#ifndef OSI_STRIPPED_LIB #ifndef OSI_STRIPPED_LIB
#ifdef CONFIG_DEBUG_FS #ifdef CONFIG_DEBUG_FS
int ret = 0;
if (debugfs_initialized()) { if (debugfs_initialized()) {
ret = ether_create_debugfs(pdata); ret = ether_create_debugfs(pdata);