Skip to content

Commit f7d4c21

Browse files
kuba-mooPaolo Abeni
kuba-moo
authored and
Paolo Abeni
committed
eth: fbnic: realign whitespace
Relign various whitespace things. Some of it is spaces which should be tabs and some is making sure the values are actually correctly aligned to "columns" with 8 space tabs. Whitespace changes only. Signed-off-by: Jakub Kicinski <kuba@kernel.org> Reviewed-by: Simon Horman <horms@kernel.org> Link: https://patch.msgid.link/20250624142834.3275164-4-kuba@kernel.org Signed-off-by: Paolo Abeni <pabeni@redhat.com>
1 parent 461bc40 commit f7d4c21

File tree

5 files changed

+52
-58
lines changed

5 files changed

+52
-58
lines changed

‎drivers/net/ethernet/meta/fbnic/fbnic_csr.h‎

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,7 @@ enum {
493493

494494
#define FBNIC_PTP_ADD_VAL_NS 0x04806 /* 0x12018 */
495495
#define FBNIC_PTP_ADD_VAL_NS_MASK CSR_GENMASK(15, 0)
496-
#define FBNIC_PTP_ADD_VAL_SUBNS 0x04807 /* 0x1201c */
496+
#define FBNIC_PTP_ADD_VAL_SUBNS 0x04807 /* 0x1201c */
497497

498498
#define FBNIC_PTP_CTR_VAL_HI 0x04808 /* 0x12020 */
499499
#define FBNIC_PTP_CTR_VAL_LO 0x04809 /* 0x12024 */
@@ -816,16 +816,12 @@ enum {
816816
#define FBNIC_CSR_START_MAC_STAT 0x11a00
817817
#define FBNIC_MAC_STAT_RX_BYTE_COUNT_L 0x11a08 /* 0x46820 */
818818
#define FBNIC_MAC_STAT_RX_BYTE_COUNT_H 0x11a09 /* 0x46824 */
819-
#define FBNIC_MAC_STAT_RX_ALIGN_ERROR_L \
820-
0x11a0a /* 0x46828 */
821-
#define FBNIC_MAC_STAT_RX_ALIGN_ERROR_H \
822-
0x11a0b /* 0x4682c */
819+
#define FBNIC_MAC_STAT_RX_ALIGN_ERROR_L 0x11a0a /* 0x46828 */
820+
#define FBNIC_MAC_STAT_RX_ALIGN_ERROR_H 0x11a0b /* 0x4682c */
823821
#define FBNIC_MAC_STAT_RX_TOOLONG_L 0x11a0e /* 0x46838 */
824822
#define FBNIC_MAC_STAT_RX_TOOLONG_H 0x11a0f /* 0x4683c */
825-
#define FBNIC_MAC_STAT_RX_RECEIVED_OK_L \
826-
0x11a12 /* 0x46848 */
827-
#define FBNIC_MAC_STAT_RX_RECEIVED_OK_H \
828-
0x11a13 /* 0x4684c */
823+
#define FBNIC_MAC_STAT_RX_RECEIVED_OK_L 0x11a12 /* 0x46848 */
824+
#define FBNIC_MAC_STAT_RX_RECEIVED_OK_H 0x11a13 /* 0x4684c */
829825
#define FBNIC_MAC_STAT_RX_PACKET_BAD_FCS_L \
830826
0x11a14 /* 0x46850 */
831827
#define FBNIC_MAC_STAT_RX_PACKET_BAD_FCS_H \
@@ -882,10 +878,8 @@ enum {
882878
0x11a42 /* 0x46908 */
883879
#define FBNIC_MAC_STAT_TX_TRANSMITTED_OK_H \
884880
0x11a43 /* 0x4690c */
885-
#define FBNIC_MAC_STAT_TX_IFOUTERRORS_L \
886-
0x11a46 /* 0x46918 */
887-
#define FBNIC_MAC_STAT_TX_IFOUTERRORS_H \
888-
0x11a47 /* 0x4691c */
881+
#define FBNIC_MAC_STAT_TX_IFOUTERRORS_L 0x11a46 /* 0x46918 */
882+
#define FBNIC_MAC_STAT_TX_IFOUTERRORS_H 0x11a47 /* 0x4691c */
889883
#define FBNIC_MAC_STAT_TX_MULTICAST_L 0x11a4a /* 0x46928 */
890884
#define FBNIC_MAC_STAT_TX_MULTICAST_H 0x11a4b /* 0x4692c */
891885
#define FBNIC_MAC_STAT_TX_BROADCAST_L 0x11a4c /* 0x46930 */
@@ -969,7 +963,7 @@ enum {
969963
0x3107e /* 0xc41f8 */
970964
#define FBNIC_PUL_USER_OB_RD_DBG_CNT_NP_CRED_63_32 \
971965
0x3107f /* 0xc41fc */
972-
#define FBNIC_CSR_END_PUL_USER 0x310ea /* CSR section delimiter */
966+
#define FBNIC_CSR_END_PUL_USER 0x310ea /* CSR section delimiter */
973967

974968
/* Queue Registers
975969
*

‎drivers/net/ethernet/meta/fbnic/fbnic_ethtool.c‎

Lines changed: 36 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1676,43 +1676,42 @@ fbnic_get_rmon_stats(struct net_device *netdev,
16761676
}
16771677

16781678
static const struct ethtool_ops fbnic_ethtool_ops = {
1679-
.supported_coalesce_params =
1680-
ETHTOOL_COALESCE_USECS |
1681-
ETHTOOL_COALESCE_RX_MAX_FRAMES,
1682-
.rxfh_max_num_contexts = FBNIC_RPC_RSS_TBL_COUNT,
1683-
.get_drvinfo = fbnic_get_drvinfo,
1684-
.get_regs_len = fbnic_get_regs_len,
1685-
.get_regs = fbnic_get_regs,
1686-
.get_link = ethtool_op_get_link,
1687-
.get_coalesce = fbnic_get_coalesce,
1688-
.set_coalesce = fbnic_set_coalesce,
1689-
.get_ringparam = fbnic_get_ringparam,
1690-
.set_ringparam = fbnic_set_ringparam,
1691-
.get_pauseparam = fbnic_phylink_get_pauseparam,
1692-
.set_pauseparam = fbnic_phylink_set_pauseparam,
1693-
.get_strings = fbnic_get_strings,
1694-
.get_ethtool_stats = fbnic_get_ethtool_stats,
1695-
.get_sset_count = fbnic_get_sset_count,
1696-
.get_rxnfc = fbnic_get_rxnfc,
1697-
.set_rxnfc = fbnic_set_rxnfc,
1698-
.get_rxfh_key_size = fbnic_get_rxfh_key_size,
1699-
.get_rxfh_indir_size = fbnic_get_rxfh_indir_size,
1700-
.get_rxfh = fbnic_get_rxfh,
1701-
.set_rxfh = fbnic_set_rxfh,
1702-
.get_rxfh_fields = fbnic_get_rss_hash_opts,
1703-
.set_rxfh_fields = fbnic_set_rss_hash_opts,
1704-
.create_rxfh_context = fbnic_create_rxfh_context,
1705-
.modify_rxfh_context = fbnic_modify_rxfh_context,
1706-
.remove_rxfh_context = fbnic_remove_rxfh_context,
1707-
.get_channels = fbnic_get_channels,
1708-
.set_channels = fbnic_set_channels,
1709-
.get_ts_info = fbnic_get_ts_info,
1710-
.get_ts_stats = fbnic_get_ts_stats,
1711-
.get_link_ksettings = fbnic_phylink_ethtool_ksettings_get,
1712-
.get_fecparam = fbnic_phylink_get_fecparam,
1713-
.get_eth_mac_stats = fbnic_get_eth_mac_stats,
1714-
.get_eth_ctrl_stats = fbnic_get_eth_ctrl_stats,
1715-
.get_rmon_stats = fbnic_get_rmon_stats,
1679+
.supported_coalesce_params = ETHTOOL_COALESCE_USECS |
1680+
ETHTOOL_COALESCE_RX_MAX_FRAMES,
1681+
.rxfh_max_num_contexts = FBNIC_RPC_RSS_TBL_COUNT,
1682+
.get_drvinfo = fbnic_get_drvinfo,
1683+
.get_regs_len = fbnic_get_regs_len,
1684+
.get_regs = fbnic_get_regs,
1685+
.get_link = ethtool_op_get_link,
1686+
.get_coalesce = fbnic_get_coalesce,
1687+
.set_coalesce = fbnic_set_coalesce,
1688+
.get_ringparam = fbnic_get_ringparam,
1689+
.set_ringparam = fbnic_set_ringparam,
1690+
.get_pauseparam = fbnic_phylink_get_pauseparam,
1691+
.set_pauseparam = fbnic_phylink_set_pauseparam,
1692+
.get_strings = fbnic_get_strings,
1693+
.get_ethtool_stats = fbnic_get_ethtool_stats,
1694+
.get_sset_count = fbnic_get_sset_count,
1695+
.get_rxnfc = fbnic_get_rxnfc,
1696+
.set_rxnfc = fbnic_set_rxnfc,
1697+
.get_rxfh_key_size = fbnic_get_rxfh_key_size,
1698+
.get_rxfh_indir_size = fbnic_get_rxfh_indir_size,
1699+
.get_rxfh = fbnic_get_rxfh,
1700+
.set_rxfh = fbnic_set_rxfh,
1701+
.get_rxfh_fields = fbnic_get_rss_hash_opts,
1702+
.set_rxfh_fields = fbnic_set_rss_hash_opts,
1703+
.create_rxfh_context = fbnic_create_rxfh_context,
1704+
.modify_rxfh_context = fbnic_modify_rxfh_context,
1705+
.remove_rxfh_context = fbnic_remove_rxfh_context,
1706+
.get_channels = fbnic_get_channels,
1707+
.set_channels = fbnic_set_channels,
1708+
.get_ts_info = fbnic_get_ts_info,
1709+
.get_ts_stats = fbnic_get_ts_stats,
1710+
.get_link_ksettings = fbnic_phylink_ethtool_ksettings_get,
1711+
.get_fecparam = fbnic_phylink_get_fecparam,
1712+
.get_eth_mac_stats = fbnic_get_eth_mac_stats,
1713+
.get_eth_ctrl_stats = fbnic_get_eth_ctrl_stats,
1714+
.get_rmon_stats = fbnic_get_rmon_stats,
17161715
};
17171716

17181717
void fbnic_set_ethtool_ops(struct net_device *dev)

‎drivers/net/ethernet/meta/fbnic/fbnic_fw.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -376,11 +376,11 @@ fbnic_fw_get_cmpl_by_type(struct fbnic_dev *fbd, u32 msg_type)
376376
*
377377
* Return:
378378
* One the following values:
379-
* -EOPNOTSUPP: Is not ASIC so mailbox is not supported
380-
* -ENODEV: Device I/O error
381-
* -ENOMEM: Failed to allocate message
382-
* -EBUSY: No space in mailbox
383-
* -ENOSPC: DMA mapping failed
379+
* -EOPNOTSUPP: Is not ASIC so mailbox is not supported
380+
* -ENODEV: Device I/O error
381+
* -ENOMEM: Failed to allocate message
382+
* -EBUSY: No space in mailbox
383+
* -ENOSPC: DMA mapping failed
384384
*
385385
* This function sends a single TLV header indicating the host wants to take
386386
* some action. However there are no other side effects which means that any

‎drivers/net/ethernet/meta/fbnic/fbnic_fw.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ struct fbnic_fw_mbx {
1919
};
2020

2121
// FW_VER_MAX_SIZE must match ETHTOOL_FWVERS_LEN
22-
#define FBNIC_FW_VER_MAX_SIZE 32
22+
#define FBNIC_FW_VER_MAX_SIZE 32
2323
// Formatted version is in the format XX.YY.ZZ_RRR_COMMIT
2424
#define FBNIC_FW_CAP_RESP_COMMIT_MAX_SIZE (FBNIC_FW_VER_MAX_SIZE - 13)
25-
#define FBNIC_FW_LOG_MAX_SIZE 256
25+
#define FBNIC_FW_LOG_MAX_SIZE 256
2626

2727
struct fbnic_fw_ver {
2828
u32 version;

‎drivers/net/ethernet/meta/fbnic/fbnic_netdev.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ int fbnic_netdev_register(struct net_device *netdev);
8181
void fbnic_netdev_unregister(struct net_device *netdev);
8282
void fbnic_reset_queues(struct fbnic_net *fbn,
8383
unsigned int tx, unsigned int rx);
84+
8485
void fbnic_set_ethtool_ops(struct net_device *dev);
8586

8687
int fbnic_ptp_setup(struct fbnic_dev *fbd);

0 commit comments

Comments
 (0)