diff --git a/drivers/net/ethernet/mucse/rnp/rnp_main.c b/drivers/net/ethernet/mucse/rnp/rnp_main.c index 59d7873bf0176..db7927f70ceac 100644 --- a/drivers/net/ethernet/mucse/rnp/rnp_main.c +++ b/drivers/net/ethernet/mucse/rnp/rnp_main.c @@ -6162,7 +6162,7 @@ netdev_tx_t rnp_xmit_frame_ring(struct sk_buff *skb, * protocol and store the tag */ /* veb only use ctags */ - } else if ((protocol == htons(ETH_P_8021Q))) { + } else if (protocol == htons(ETH_P_8021Q)) { struct vlan_hdr *vhdr, _vhdr; vhdr = skb_header_pointer(skb, ETH_HLEN, sizeof(_vhdr), diff --git a/drivers/net/ethernet/mucse/rnp/rnp_n10.c b/drivers/net/ethernet/mucse/rnp/rnp_n10.c index 1cc0ba9836f1e..3d626bc0f6553 100644 --- a/drivers/net/ethernet/mucse/rnp/rnp_n10.c +++ b/drivers/net/ethernet/mucse/rnp/rnp_n10.c @@ -3326,8 +3326,8 @@ static int rnp10_set_link_ksettings(struct net_device *netdev, if (advertising_link_speed) { hw->phy.autoneg_advertised = advertising_link_speed; } else { - if ((hw->force_speed_stat == - FORCE_SPEED_STAT_DISABLED)) { + if (hw->force_speed_stat == + FORCE_SPEED_STAT_DISABLED) { netdev_info(netdev, "advertising_link_speed is 0\n"); err = -EINVAL; @@ -4205,7 +4205,6 @@ static s32 rnp_get_thermal_sensor_data_hw_ops_n10(struct rnp_hw *hw) int voltage = 0; struct rnp_thermal_sensor_data *data = &hw->thermal_sensor_data; - voltage = voltage; data->sensor[0].temp = rnp_mbx_get_temp(hw, &voltage); return 0; diff --git a/drivers/net/ethernet/mucse/rnpgbe/rnpgbe_chip.c b/drivers/net/ethernet/mucse/rnpgbe/rnpgbe_chip.c index eb87d01f05796..e0795ba6166b6 100644 --- a/drivers/net/ethernet/mucse/rnpgbe/rnpgbe_chip.c +++ b/drivers/net/ethernet/mucse/rnpgbe/rnpgbe_chip.c @@ -3391,7 +3391,6 @@ static s32 rnpgbe_get_thermal_sensor_data_hw_ops_n500(struct rnpgbe_hw *hw) int voltage = 0; struct rnpgbe_thermal_sensor_data *data = &hw->thermal_sensor_data; - voltage = voltage; data->sensor[0].temp = rnpgbe_mbx_get_temp(hw, &voltage); return 0; diff --git a/drivers/net/ethernet/mucse/rnpgbe/rnpgbe_mbx_fw.h b/drivers/net/ethernet/mucse/rnpgbe/rnpgbe_mbx_fw.h index 7d115fe2aeaa2..1059d0c11954e 100644 --- a/drivers/net/ethernet/mucse/rnpgbe/rnpgbe_mbx_fw.h +++ b/drivers/net/ethernet/mucse/rnpgbe/rnpgbe_mbx_fw.h @@ -26,7 +26,8 @@ struct mbx_req_cookie { int done; int priv_len; - char priv[0]; +#define MAX_PRIV_LEN 64 + char priv[MAX_PRIV_LEN]; }; enum GENERIC_CMD { diff --git a/drivers/net/ethernet/mucse/rnpgbevf/rnpgbevf_ethtool.c b/drivers/net/ethernet/mucse/rnpgbevf/rnpgbevf_ethtool.c index 4e32d557a33fa..4848bbbb77359 100644 --- a/drivers/net/ethernet/mucse/rnpgbevf/rnpgbevf_ethtool.c +++ b/drivers/net/ethernet/mucse/rnpgbevf/rnpgbevf_ethtool.c @@ -128,7 +128,8 @@ static int rnpgbevf_get_link_ksettings(struct net_device *netdev, struct rnpgbevf_hw *hw = &adapter->hw; bool autoneg = false; bool link_up; - u32 supported, advertising; + u32 supported; + u32 advertising = 0; u32 link_speed = 0; ethtool_convert_link_mode_to_legacy_u32(&supported,