移去rt

hc

2023-12-08 01573e231f18eb2d99162747186f59511f56b64d

 kernel/drivers/net/ethernet/intel/fm10k/fm10k_pf.c
..
..
@@ -1,5 +1,5 @@
1
1
 // SPDX-License-Identifier: GPL-2.0
2
-/* Copyright(c) 2013 - 2018 Intel Corporation. */
2
+/* Copyright(c) 2013 - 2019 Intel Corporation. */
3
3
 
4
4
 #include "fm10k_pf.h"
5
5
 #include "fm10k_vf.h"
..
..
@@ -1148,11 +1148,11 @@
1148
1148
  *  @results: Pointer array to message, results[0] is pointer to message
1149
1149
  *  @mbx: Pointer to mailbox information structure
1150
1150
  *
1151
- *  This function is a default handler for MSI-X requests from the VF.  The
1151
+ *  This function is a default handler for MSI-X requests from the VF. The
1152
1152
  *  assumption is that in this case it is acceptable to just directly
1153
1153
  *  hand off the message from the VF to the underlying shared code.
1154
1154
  **/
1155
-s32 fm10k_iov_msg_msix_pf(struct fm10k_hw *hw, u32 **results,
1155
+s32 fm10k_iov_msg_msix_pf(struct fm10k_hw *hw, u32 __always_unused **results,
1156
1156
 			  struct fm10k_mbx_info *mbx)
1157
1157
 {
1158
1158
 	struct fm10k_vf_info *vf_info = (struct fm10k_vf_info *)mbx;
..
..
@@ -1317,19 +1317,19 @@
1317
1317
 	case FM10K_XCAST_MODE_PROMISC:
1318
1318
 		if (vf_flags & FM10K_VF_FLAG_PROMISC_CAPABLE)
1319
1319
 			return FM10K_XCAST_MODE_PROMISC;
1320
-		/* fall through */
1320
+		fallthrough;
1321
1321
 	case FM10K_XCAST_MODE_ALLMULTI:
1322
1322
 		if (vf_flags & FM10K_VF_FLAG_ALLMULTI_CAPABLE)
1323
1323
 			return FM10K_XCAST_MODE_ALLMULTI;
1324
-		/* fall through */
1324
+		fallthrough;
1325
1325
 	case FM10K_XCAST_MODE_MULTI:
1326
1326
 		if (vf_flags & FM10K_VF_FLAG_MULTI_CAPABLE)
1327
1327
 			return FM10K_XCAST_MODE_MULTI;
1328
-		/* fall through */
1328
+		fallthrough;
1329
1329
 	case FM10K_XCAST_MODE_NONE:
1330
1330
 		if (vf_flags & FM10K_VF_FLAG_NONE_CAPABLE)
1331
1331
 			return FM10K_XCAST_MODE_NONE;
1332
-		/* fall through */
1332
+		fallthrough;
1333
1333
 	default:
1334
1334
 		break;
1335
1335
 	}
..
..
@@ -1352,7 +1352,6 @@
1352
1352
 				 struct fm10k_mbx_info *mbx)
1353
1353
 {
1354
1354
 	struct fm10k_vf_info *vf_info = (struct fm10k_vf_info *)mbx;
1355
-	u32 *result;
1356
1355
 	s32 err = 0;
1357
1356
 	u32 msg[2];
1358
1357
 	u8 mode = 0;
..
..
@@ -1362,7 +1361,7 @@
1362
1361
 		return FM10K_ERR_PARAM;
1363
1362
 
1364
1363
 	if (!!results[FM10K_LPORT_STATE_MSG_XCAST_MODE]) {
1365
-		result = results[FM10K_LPORT_STATE_MSG_XCAST_MODE];
1364
+		u32 *result = results[FM10K_LPORT_STATE_MSG_XCAST_MODE];
1366
1365
 
1367
1366
 		/* XCAST mode update requested */
1368
1367
 		err = fm10k_tlv_attr_get_u8(result, &mode);
..
..
@@ -1566,7 +1565,7 @@
1566
1565
 	/* read remaining fields */
1567
1566
 	fault->address = fm10k_read_reg(hw, type + FM10K_FAULT_ADDR_HI);
1568
1567
 	fault->address <<= 32;
1569
-	fault->address = fm10k_read_reg(hw, type + FM10K_FAULT_ADDR_LO);
1568
+	fault->address |= fm10k_read_reg(hw, type + FM10K_FAULT_ADDR_LO);
1570
1569
 	fault->specinfo = fm10k_read_reg(hw, type + FM10K_FAULT_SPECINFO);
1571
1570
 
1572
1571
 	/* clear valid bit to allow for next error */
..
..
@@ -1642,7 +1641,7 @@
1642
1641
  *  switch API.
1643
1642
  **/
1644
1643
 s32 fm10k_msg_lport_map_pf(struct fm10k_hw *hw, u32 **results,
1645
-			   struct fm10k_mbx_info *mbx)
1644
+			   struct fm10k_mbx_info __always_unused *mbx)
1646
1645
 {
1647
1646
 	u16 glort, mask;
1648
1647
 	u32 dglort_map;
..
..
@@ -1685,7 +1684,7 @@
1685
1684
  *  This handler configures the default VLAN for the PF
1686
1685
  **/
1687
1686
 static s32 fm10k_msg_update_pvid_pf(struct fm10k_hw *hw, u32 **results,
1688
-				    struct fm10k_mbx_info *mbx)
1687
+				    struct fm10k_mbx_info __always_unused *mbx)
1689
1688
 {
1690
1689
 	u16 glort, pvid;
1691
1690
 	u32 pvid_update;
..
..
@@ -1746,7 +1745,7 @@
1746
1745
  *  messages that the PF has sent.
1747
1746
  **/
1748
1747
 s32 fm10k_msg_err_pf(struct fm10k_hw *hw, u32 **results,
1749
-		     struct fm10k_mbx_info *mbx)
1748
+		     struct fm10k_mbx_info __always_unused *mbx)
1750
1749
 {
1751
1750
 	struct fm10k_swapi_error err_msg;
1752
1751
 	s32 err;