Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ixgbe: Use function pointer for ixgbe_acquire/release_swfw_sync()

Change remaining direct calls to function pointers.

Signed-off-by: Emil Tantilov <emil.s.tantilov@intel.com>
Tested-by: Evan Swanson <evan.swanson@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

authored by

Emil Tantilov and committed by
Jeff Kirsher
6d980c3e 97322b33

+7 -8
+1 -2
drivers/net/ixgbe/ixgbe_82599.c
··· 110 110 111 111 ret_val = ixgbe_get_sfp_init_sequence_offsets(hw, &list_offset, 112 112 &data_offset); 113 - 114 113 if (ret_val != 0) 115 114 goto setup_sfp_out; 116 115 ··· 129 130 } 130 131 131 132 /* Release the semaphore */ 132 - ixgbe_release_swfw_sync(hw, IXGBE_GSSR_MAC_CSR_SM); 133 + hw->mac.ops.release_swfw_sync(hw, IXGBE_GSSR_MAC_CSR_SM); 133 134 /* 134 135 * Delay obtaining semaphore again to allow FW access, 135 136 * semaphore_delay is in ms usleep_range needs us.
+5 -5
drivers/net/ixgbe/ixgbe_phy.c
··· 1222 1222 swfw_mask = IXGBE_GSSR_PHY0_SM; 1223 1223 1224 1224 do { 1225 - if (ixgbe_acquire_swfw_sync(hw, swfw_mask) != 0) { 1225 + if (hw->mac.ops.acquire_swfw_sync(hw, swfw_mask) != 0) { 1226 1226 status = IXGBE_ERR_SWFW_SYNC; 1227 1227 goto read_byte_out; 1228 1228 } ··· 1269 1269 break; 1270 1270 1271 1271 fail: 1272 - ixgbe_release_swfw_sync(hw, swfw_mask); 1272 + hw->mac.ops.release_swfw_sync(hw, swfw_mask); 1273 1273 msleep(100); 1274 1274 ixgbe_i2c_bus_clear(hw); 1275 1275 retry++; ··· 1280 1280 1281 1281 } while (retry < max_retry); 1282 1282 1283 - ixgbe_release_swfw_sync(hw, swfw_mask); 1283 + hw->mac.ops.release_swfw_sync(hw, swfw_mask); 1284 1284 1285 1285 read_byte_out: 1286 1286 return status; ··· 1308 1308 else 1309 1309 swfw_mask = IXGBE_GSSR_PHY0_SM; 1310 1310 1311 - if (ixgbe_acquire_swfw_sync(hw, swfw_mask) != 0) { 1311 + if (hw->mac.ops.acquire_swfw_sync(hw, swfw_mask) != 0) { 1312 1312 status = IXGBE_ERR_SWFW_SYNC; 1313 1313 goto write_byte_out; 1314 1314 } ··· 1352 1352 hw_dbg(hw, "I2C byte write error.\n"); 1353 1353 } while (retry < max_retry); 1354 1354 1355 - ixgbe_release_swfw_sync(hw, swfw_mask); 1355 + hw->mac.ops.release_swfw_sync(hw, swfw_mask); 1356 1356 1357 1357 write_byte_out: 1358 1358 return status;
+1 -1
drivers/net/ixgbe/ixgbe_x540.c
··· 318 318 else 319 319 status = IXGBE_ERR_SWFW_SYNC; 320 320 321 - ixgbe_release_swfw_sync_X540(hw, IXGBE_GSSR_EEP_SM); 321 + hw->mac.ops.release_swfw_sync(hw, IXGBE_GSSR_EEP_SM); 322 322 return status; 323 323 } 324 324