mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 01:10:04 +00:00
sfc: Fix some formatting errors reported by checkpatch
Fix the following errors and warnings: ERROR: trailing whitespace ERROR: spaces required around that '=' (ctx:VxV) WARNING: please, no space before tabs Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
This commit is contained in:
parent
1d5783030a
commit
9c636baf85
12 changed files with 30 additions and 30 deletions
|
@ -448,40 +448,40 @@ typedef union efx_oword {
|
|||
EFX_INSERT32(min, max, low, high, EFX_MASK32(high + 1 - low))
|
||||
|
||||
#define EFX_SET_OWORD64(oword, low, high, value) do { \
|
||||
(oword).u64[0] = (((oword).u64[0] \
|
||||
(oword).u64[0] = (((oword).u64[0] \
|
||||
& ~EFX_INPLACE_MASK64(0, 63, low, high)) \
|
||||
| EFX_INSERT64(0, 63, low, high, value)); \
|
||||
(oword).u64[1] = (((oword).u64[1] \
|
||||
(oword).u64[1] = (((oword).u64[1] \
|
||||
& ~EFX_INPLACE_MASK64(64, 127, low, high)) \
|
||||
| EFX_INSERT64(64, 127, low, high, value)); \
|
||||
} while (0)
|
||||
|
||||
#define EFX_SET_QWORD64(qword, low, high, value) do { \
|
||||
(qword).u64[0] = (((qword).u64[0] \
|
||||
(qword).u64[0] = (((qword).u64[0] \
|
||||
& ~EFX_INPLACE_MASK64(0, 63, low, high)) \
|
||||
| EFX_INSERT64(0, 63, low, high, value)); \
|
||||
} while (0)
|
||||
|
||||
#define EFX_SET_OWORD32(oword, low, high, value) do { \
|
||||
(oword).u32[0] = (((oword).u32[0] \
|
||||
(oword).u32[0] = (((oword).u32[0] \
|
||||
& ~EFX_INPLACE_MASK32(0, 31, low, high)) \
|
||||
| EFX_INSERT32(0, 31, low, high, value)); \
|
||||
(oword).u32[1] = (((oword).u32[1] \
|
||||
(oword).u32[1] = (((oword).u32[1] \
|
||||
& ~EFX_INPLACE_MASK32(32, 63, low, high)) \
|
||||
| EFX_INSERT32(32, 63, low, high, value)); \
|
||||
(oword).u32[2] = (((oword).u32[2] \
|
||||
(oword).u32[2] = (((oword).u32[2] \
|
||||
& ~EFX_INPLACE_MASK32(64, 95, low, high)) \
|
||||
| EFX_INSERT32(64, 95, low, high, value)); \
|
||||
(oword).u32[3] = (((oword).u32[3] \
|
||||
(oword).u32[3] = (((oword).u32[3] \
|
||||
& ~EFX_INPLACE_MASK32(96, 127, low, high)) \
|
||||
| EFX_INSERT32(96, 127, low, high, value)); \
|
||||
} while (0)
|
||||
|
||||
#define EFX_SET_QWORD32(qword, low, high, value) do { \
|
||||
(qword).u32[0] = (((qword).u32[0] \
|
||||
(qword).u32[0] = (((qword).u32[0] \
|
||||
& ~EFX_INPLACE_MASK32(0, 31, low, high)) \
|
||||
| EFX_INSERT32(0, 31, low, high, value)); \
|
||||
(qword).u32[1] = (((qword).u32[1] \
|
||||
(qword).u32[1] = (((qword).u32[1] \
|
||||
& ~EFX_INPLACE_MASK32(32, 63, low, high)) \
|
||||
| EFX_INSERT32(32, 63, low, high, value)); \
|
||||
} while (0)
|
||||
|
|
|
@ -44,9 +44,9 @@ const char *efx_loopback_mode_names[] = {
|
|||
[LOOPBACK_GMAC] = "GMAC",
|
||||
[LOOPBACK_XGMII] = "XGMII",
|
||||
[LOOPBACK_XGXS] = "XGXS",
|
||||
[LOOPBACK_XAUI] = "XAUI",
|
||||
[LOOPBACK_GMII] = "GMII",
|
||||
[LOOPBACK_SGMII] = "SGMII",
|
||||
[LOOPBACK_XAUI] = "XAUI",
|
||||
[LOOPBACK_GMII] = "GMII",
|
||||
[LOOPBACK_SGMII] = "SGMII",
|
||||
[LOOPBACK_XGBR] = "XGBR",
|
||||
[LOOPBACK_XFI] = "XFI",
|
||||
[LOOPBACK_XAUI_FAR] = "XAUI_FAR",
|
||||
|
@ -55,17 +55,17 @@ const char *efx_loopback_mode_names[] = {
|
|||
[LOOPBACK_XFI_FAR] = "XFI_FAR",
|
||||
[LOOPBACK_GPHY] = "GPHY",
|
||||
[LOOPBACK_PHYXS] = "PHYXS",
|
||||
[LOOPBACK_PCS] = "PCS",
|
||||
[LOOPBACK_PMAPMD] = "PMA/PMD",
|
||||
[LOOPBACK_PCS] = "PCS",
|
||||
[LOOPBACK_PMAPMD] = "PMA/PMD",
|
||||
[LOOPBACK_XPORT] = "XPORT",
|
||||
[LOOPBACK_XGMII_WS] = "XGMII_WS",
|
||||
[LOOPBACK_XAUI_WS] = "XAUI_WS",
|
||||
[LOOPBACK_XAUI_WS] = "XAUI_WS",
|
||||
[LOOPBACK_XAUI_WS_FAR] = "XAUI_WS_FAR",
|
||||
[LOOPBACK_XAUI_WS_NEAR] = "XAUI_WS_NEAR",
|
||||
[LOOPBACK_GMII_WS] = "GMII_WS",
|
||||
[LOOPBACK_GMII_WS] = "GMII_WS",
|
||||
[LOOPBACK_XFI_WS] = "XFI_WS",
|
||||
[LOOPBACK_XFI_WS_FAR] = "XFI_WS_FAR",
|
||||
[LOOPBACK_PHYXS_WS] = "PHYXS_WS",
|
||||
[LOOPBACK_PHYXS_WS] = "PHYXS_WS",
|
||||
};
|
||||
|
||||
const unsigned int efx_reset_type_max = RESET_TYPE_MAX;
|
||||
|
|
|
@ -68,11 +68,11 @@ static u64 efx_get_atomic_stat(void *field)
|
|||
}
|
||||
|
||||
#define EFX_ETHTOOL_ULONG_MAC_STAT(field) \
|
||||
EFX_ETHTOOL_STAT(field, mac_stats, field, \
|
||||
EFX_ETHTOOL_STAT(field, mac_stats, field, \
|
||||
unsigned long, efx_get_ulong_stat)
|
||||
|
||||
#define EFX_ETHTOOL_U64_MAC_STAT(field) \
|
||||
EFX_ETHTOOL_STAT(field, mac_stats, field, \
|
||||
EFX_ETHTOOL_STAT(field, mac_stats, field, \
|
||||
u64, efx_get_u64_stat)
|
||||
|
||||
#define EFX_ETHTOOL_UINT_NIC_STAT(name) \
|
||||
|
|
|
@ -139,7 +139,7 @@ static bool falcon_xmac_link_ok(struct efx_nic *efx)
|
|||
return (efx->loopback_mode == LOOPBACK_XGMII ||
|
||||
falcon_xgxs_link_ok(efx)) &&
|
||||
(!(efx->mdio.mmds & (1 << MDIO_MMD_PHYXS)) ||
|
||||
LOOPBACK_INTERNAL(efx) ||
|
||||
LOOPBACK_INTERNAL(efx) ||
|
||||
efx_mdio_phyxgxs_lane_sync(efx));
|
||||
}
|
||||
|
||||
|
|
|
@ -141,5 +141,5 @@ static bool efx_mcdi_mac_check_fault(struct efx_nic *efx)
|
|||
const struct efx_mac_operations efx_mcdi_mac_operations = {
|
||||
.reconfigure = efx_mcdi_mac_reconfigure,
|
||||
.update_stats = efx_port_dummy_op_void,
|
||||
.check_fault = efx_mcdi_mac_check_fault,
|
||||
.check_fault = efx_mcdi_mac_check_fault,
|
||||
};
|
||||
|
|
|
@ -741,7 +741,7 @@ static const char *efx_mcdi_phy_test_name(struct efx_nic *efx,
|
|||
|
||||
const struct efx_phy_operations efx_mcdi_phy_ops = {
|
||||
.probe = efx_mcdi_phy_probe,
|
||||
.init = efx_port_dummy_op_int,
|
||||
.init = efx_port_dummy_op_int,
|
||||
.reconfigure = efx_mcdi_phy_reconfigure,
|
||||
.poll = efx_mcdi_phy_poll,
|
||||
.fini = efx_port_dummy_op_void,
|
||||
|
|
|
@ -228,7 +228,7 @@ void efx_mdio_set_mmds_lpower(struct efx_nic *efx,
|
|||
/**
|
||||
* efx_mdio_set_settings - Set (some of) the PHY settings over MDIO.
|
||||
* @efx: Efx NIC
|
||||
* @ecmd: New settings
|
||||
* @ecmd: New settings
|
||||
*/
|
||||
int efx_mdio_set_settings(struct efx_nic *efx, struct ethtool_cmd *ecmd)
|
||||
{
|
||||
|
|
|
@ -1837,7 +1837,7 @@ struct efx_nic_reg_table {
|
|||
REGISTER_REVISION_ ## min_rev, REGISTER_REVISION_ ## max_rev, \
|
||||
step, rows \
|
||||
}
|
||||
#define REGISTER_TABLE(name, min_rev, max_rev) \
|
||||
#define REGISTER_TABLE(name, min_rev, max_rev) \
|
||||
REGISTER_TABLE_DIMENSIONS( \
|
||||
name, FR_ ## min_rev ## max_rev ## _ ## name, \
|
||||
min_rev, max_rev, \
|
||||
|
|
|
@ -47,7 +47,7 @@
|
|||
#define PMA_PMD_FTX_STATIC_LBN 13
|
||||
#define PMA_PMD_VEND1_REG 0xc001
|
||||
#define PMA_PMD_VEND1_LBTXD_LBN 15
|
||||
#define PCS_VEND1_REG 0xc000
|
||||
#define PCS_VEND1_REG 0xc000
|
||||
#define PCS_VEND1_LBTXD_LBN 5
|
||||
|
||||
void falcon_qt202x_set_led(struct efx_nic *p, int led, int mode)
|
||||
|
@ -453,9 +453,9 @@ const struct efx_phy_operations falcon_qt202x_phy_ops = {
|
|||
.probe = qt202x_phy_probe,
|
||||
.init = qt202x_phy_init,
|
||||
.reconfigure = qt202x_phy_reconfigure,
|
||||
.poll = qt202x_phy_poll,
|
||||
.poll = qt202x_phy_poll,
|
||||
.fini = efx_port_dummy_op_void,
|
||||
.remove = qt202x_phy_remove,
|
||||
.remove = qt202x_phy_remove,
|
||||
.get_settings = qt202x_phy_get_settings,
|
||||
.set_settings = efx_mdio_set_settings,
|
||||
.test_alive = efx_mdio_test_alive,
|
||||
|
|
|
@ -445,7 +445,7 @@ static int efx_end_loopback(struct efx_tx_queue *tx_queue,
|
|||
|
||||
/* Count the number of tx completions, and decrement the refcnt. Any
|
||||
* skbs not already completed will be free'd when the queue is flushed */
|
||||
for (i=0; i < state->packet_count; i++) {
|
||||
for (i = 0; i < state->packet_count; i++) {
|
||||
skb = state->skbs[i];
|
||||
if (skb && !skb_shared(skb))
|
||||
++tx_done;
|
||||
|
|
|
@ -68,7 +68,7 @@ static inline bool efx_spi_present(const struct efx_spi_device *spi)
|
|||
|
||||
int falcon_spi_cmd(struct efx_nic *efx,
|
||||
const struct efx_spi_device *spi, unsigned int command,
|
||||
int address, const void* in, void *out, size_t len);
|
||||
int address, const void *in, void *out, size_t len);
|
||||
int falcon_spi_wait_write(struct efx_nic *efx,
|
||||
const struct efx_spi_device *spi);
|
||||
int falcon_spi_read(struct efx_nic *efx,
|
||||
|
|
|
@ -121,7 +121,7 @@
|
|||
#define GPHY_XCONTROL_REG 49152
|
||||
#define GPHY_ISOLATE_LBN 10
|
||||
#define GPHY_ISOLATE_WIDTH 1
|
||||
#define GPHY_DUPLEX_LBN 8
|
||||
#define GPHY_DUPLEX_LBN 8
|
||||
#define GPHY_DUPLEX_WIDTH 1
|
||||
#define GPHY_LOOPBACK_NEAR_LBN 14
|
||||
#define GPHY_LOOPBACK_NEAR_WIDTH 1
|
||||
|
|
Loading…
Reference in a new issue