From 80336d6c964e49a4ba2ac85f8c5250a2a62ec7a7 Mon Sep 17 00:00:00 2001 From: Revanth Kumar Uppala Date: Tue, 4 Apr 2023 01:40:39 +0000 Subject: [PATCH] nvethernet: Fix compilation warnings 1.There is a switch-case where one case is falling to the next case. This is creating the compilation warning. Make this fall through as intentional by adding compiler attribute as "fallthrough". 2.Remove redefinition of macro MII_ADDR_C45 Bug 4055275 Change-Id: I99193b225e97c414588bb306cb48e472ae079f9f Signed-off-by: Revanth Kumar Uppala Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/2882027 Tested-by: mobile promotions Reviewed-by: mobile promotions --- drivers/net/ethernet/nvidia/nvethernet/ether_linux.h | 1 - drivers/net/ethernet/nvidia/nvethernet/selftests.c | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/nvidia/nvethernet/ether_linux.h b/drivers/net/ethernet/nvidia/nvethernet/ether_linux.h index 0d1f5883..f0705c8b 100644 --- a/drivers/net/ethernet/nvidia/nvethernet/ether_linux.h +++ b/drivers/net/ethernet/nvidia/nvethernet/ether_linux.h @@ -307,7 +307,6 @@ static inline int ether_avail_txdesc_cnt(struct osi_dma_priv_data *osi_dma, #define ETHER_VM_IRQ_RX_CHAN_MASK(x) BIT(((x) * 2U) + 1U) /* MDIO clause 45 bit */ -#define MII_ADDR_C45 OSI_BIT(30) #define MII_DEVADDR_C45_SHIFT 16 /** diff --git a/drivers/net/ethernet/nvidia/nvethernet/selftests.c b/drivers/net/ethernet/nvidia/nvethernet/selftests.c index ae162a16..9fbdbe33 100644 --- a/drivers/net/ethernet/nvidia/nvethernet/selftests.c +++ b/drivers/net/ethernet/nvidia/nvethernet/selftests.c @@ -402,6 +402,7 @@ void ether_selftest_run(struct net_device *dev, if (!ret) break; /* Fallthrough */ + fallthrough; case ETHER_LOOPBACK_MAC: if (pdata->osi_core) { ioctl_data.cmd = OSI_CMD_MAC_LB; @@ -434,6 +435,7 @@ void ether_selftest_run(struct net_device *dev, if (!ret) break; /* Fallthrough */ + fallthrough; case ETHER_LOOPBACK_MAC: if (pdata->osi_core) { ioctl_data.cmd = OSI_CMD_MAC_LB;