* [PATCH iwl-next v1 2/2] igc: clean up redundant braces and code formatting
2026-11-08 14:45 [PATCH iwl-next v1 1/2] igc: remove unused extended wakeup filter definitions Sasha Neftin
@ 2026-11-08 14:45 ` Sasha Neftin
2026-11-08 14:52 ` [PATCH iwl-next v1 1/2] igc: remove unused extended wakeup filter definitions sashiko-bot
2026-11-09 10:40 ` Loktionov, Aleksandr
2 siblings, 0 replies; 4+ messages in thread
From: Sasha Neftin @ 2026-11-08 14:45 UTC (permalink / raw)
To: intel-wired-lan; +Cc: Sasha Neftin
Clean up minor coding style issues in the igc driver:
- Remove unnecessary curly braces around single-statement `if` blocks
in `igc_tx_map()` and `igc_enable_nfc_rule()`.
- Fix line-wrapping and indentation for fragment size calculations.
- Remove trailing empty lines/whitespace.
Signed-off-by: Sasha Neftin <sashaneftin@gmail.com>
---
drivers/net/ethernet/intel/igc/igc_main.c | 12 +++++-------
drivers/net/ethernet/intel/igc/igc_ptp.c | 1 -
drivers/net/ethernet/intel/igc/igc_tsn.c | 1 -
3 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c
index 019f0c2375d7..edfa042ed71a 100644
--- a/drivers/net/ethernet/intel/igc/igc_main.c
+++ b/drivers/net/ethernet/intel/igc/igc_main.c
@@ -1415,9 +1415,8 @@ static int igc_tx_map(struct igc_ring *tx_ring,
/* Make sure there is space in the ring for the next send. */
igc_maybe_stop_tx(tx_ring, DESC_NEEDED);
- if (netif_xmit_stopped(txring_txq(tx_ring)) || !netdev_xmit_more()) {
+ if (netif_xmit_stopped(txring_txq(tx_ring)) || !netdev_xmit_more())
writel(i, tx_ring->tail);
- }
return 0;
dma_error:
@@ -1617,8 +1616,8 @@ static netdev_tx_t igc_xmit_frame_ring(struct sk_buff *skb,
* otherwise try next time
*/
for (f = 0; f < skb_shinfo(skb)->nr_frags; f++)
- count += TXD_USE_COUNT(skb_frag_size(
- &skb_shinfo(skb)->frags[f]));
+ count += TXD_USE_COUNT(skb_frag_size(&skb_shinfo(skb)->
+ frags[f]));
if (igc_maybe_stop_tx(tx_ring, count + 5)) {
/* This is a hard error. Write the tail for packets deferred
@@ -2795,7 +2794,7 @@ static struct igc_xdp_buff *xsk_buff_to_igc_ctx(struct xdp_buff *xdp)
* igc_xdp_buff shares its layout with xdp_buff_xsk and private
* igc_xdp_buff fields fall into xdp_buff_xsk->cb
*/
- return (struct igc_xdp_buff *)xdp;
+ return (struct igc_xdp_buff *)xdp;
}
static int igc_clean_rx_irq_zc(struct igc_q_vector *q_vector, const int budget)
@@ -3900,9 +3899,8 @@ static int igc_enable_nfc_rule(struct igc_adapter *adapter,
{
int err;
- if (rule->flex) {
+ if (rule->flex)
return igc_add_flex_filter(adapter, rule);
- }
if (rule->filter.match_flags & IGC_FILTER_FLAG_ETHER_TYPE) {
err = igc_add_etype_filter(adapter, rule->filter.etype,
diff --git a/drivers/net/ethernet/intel/igc/igc_ptp.c b/drivers/net/ethernet/intel/igc/igc_ptp.c
index b40aba9ab685..fe808ffeaff7 100644
--- a/drivers/net/ethernet/intel/igc/igc_ptp.c
+++ b/drivers/net/ethernet/intel/igc/igc_ptp.c
@@ -649,7 +649,6 @@ static void igc_ptp_enable_tx_timestamp(struct igc_adapter *adapter)
set_bit(IGC_RING_FLAG_TX_HWTSTAMP, &tx_ring->flags);
}
-
}
/**
diff --git a/drivers/net/ethernet/intel/igc/igc_tsn.c b/drivers/net/ethernet/intel/igc/igc_tsn.c
index d23a45a34fa3..0ccba557918d 100644
--- a/drivers/net/ethernet/intel/igc/igc_tsn.c
+++ b/drivers/net/ethernet/intel/igc/igc_tsn.c
@@ -243,7 +243,6 @@ static unsigned int igc_tsn_new_flags(struct igc_adapter *adapter)
{
unsigned int new_flags = adapter->flags & ~IGC_FLAG_TSN_ANY_ENABLED;
-
if (adapter->taprio_offload_enable || is_any_launchtime(adapter) ||
adapter->strict_priority_enable)
new_flags |= IGC_FLAG_TSN_QBV_ENABLED;
--
2.47.3
^ permalink raw reply related [flat|nested] 4+ messages in thread* RE: [PATCH iwl-next v1 1/2] igc: remove unused extended wakeup filter definitions
2026-11-08 14:45 [PATCH iwl-next v1 1/2] igc: remove unused extended wakeup filter definitions Sasha Neftin
2026-11-08 14:45 ` [PATCH iwl-next v1 2/2] igc: clean up redundant braces and code formatting Sasha Neftin
2026-11-08 14:52 ` [PATCH iwl-next v1 1/2] igc: remove unused extended wakeup filter definitions sashiko-bot
@ 2026-11-09 10:40 ` Loktionov, Aleksandr
2 siblings, 0 replies; 4+ messages in thread
From: Loktionov, Aleksandr @ 2026-11-09 10:40 UTC (permalink / raw)
To: Sasha Neftin, intel-wired-lan@lists.osuosl.org
> -----Original Message-----
> From: Sasha Neftin <sashaneftin@gmail.com>
> Sent: Sunday, November 8, 2026 3:45 PM
> To: intel-wired-lan@lists.osuosl.org
> Cc: Sasha Neftin <sashaneftin@gmail.com>
> Subject: [PATCH iwl-next v1 1/2] igc: remove unused extended wakeup
> filter definitions
>
> Remove unused IGC_WUFC_EXT_FLX9 through IGC_WUFC_EXT_FLX31 bitmask
> definitions from igc_defines.h. These extended flexible wakeup filter
> bits are not utilized by the driver.
>
> Signed-off-by: Sasha Neftin <sashaneftin@gmail.com>
> ---
> drivers/net/ethernet/intel/igc/igc_defines.h | 30 --------------------
> 1 file changed, 30 deletions(-)
>
> diff --git a/drivers/net/ethernet/intel/igc/igc_defines.h
> b/drivers/net/ethernet/intel/igc/igc_defines.h
> index ab55b88d4d96..369aaccbd24e 100644
> --- a/drivers/net/ethernet/intel/igc/igc_defines.h
> +++ b/drivers/net/ethernet/intel/igc/igc_defines.h
> @@ -26,13 +26,6 @@
> #define IGC_WUFC_BC 0x00000010 /* Broadcast Wakeup Enable */
> #define IGC_WUFC_FLEX_HQ BIT(14) /* Flex Filters Host
> Queuing */
> #define IGC_WUFC_FLX0 BIT(16) /* Flexible Filter
> 0 Enable */
> -#define IGC_WUFC_FLX1 BIT(17) /* Flexible Filter
> 1 Enable */
> -#define IGC_WUFC_FLX2 BIT(18) /* Flexible Filter
> 2 Enable */
> -#define IGC_WUFC_FLX3 BIT(19) /* Flexible Filter
> 3 Enable */
> -#define IGC_WUFC_FLX4 BIT(20) /* Flexible Filter
> 4 Enable */
> -#define IGC_WUFC_FLX5 BIT(21) /* Flexible Filter
> 5 Enable */
> -#define IGC_WUFC_FLX6 BIT(22) /* Flexible Filter
> 6 Enable */
> -#define IGC_WUFC_FLX7 BIT(23) /* Flexible Filter
> 7 Enable */
>
> #define IGC_WUFC_FILTER_MASK GENMASK(23, 14)
>
> @@ -61,29 +54,6 @@
>
> /* Wakeup Filter Control Extended */
> #define IGC_WUFC_EXT_FLX8 BIT(8) /* Flexible Filter 8 Enable */
> -#define IGC_WUFC_EXT_FLX9 BIT(9) /* Flexible Filter 9 Enable */
> -#define IGC_WUFC_EXT_FLX10 BIT(10) /* Flexible Filter 10 Enable
> */
> -#define IGC_WUFC_EXT_FLX11 BIT(11) /* Flexible Filter 11 Enable
> */
> -#define IGC_WUFC_EXT_FLX12 BIT(12) /* Flexible Filter 12 Enable
> */
> -#define IGC_WUFC_EXT_FLX13 BIT(13) /* Flexible Filter 13 Enable
> */
> -#define IGC_WUFC_EXT_FLX14 BIT(14) /* Flexible Filter 14 Enable
> */
> -#define IGC_WUFC_EXT_FLX15 BIT(15) /* Flexible Filter 15 Enable
> */
> -#define IGC_WUFC_EXT_FLX16 BIT(16) /* Flexible Filter 16 Enable
> */
> -#define IGC_WUFC_EXT_FLX17 BIT(17) /* Flexible Filter 17 Enable
> */
> -#define IGC_WUFC_EXT_FLX18 BIT(18) /* Flexible Filter 18 Enable
> */
> -#define IGC_WUFC_EXT_FLX19 BIT(19) /* Flexible Filter 19 Enable
> */
> -#define IGC_WUFC_EXT_FLX20 BIT(20) /* Flexible Filter 20 Enable
> */
> -#define IGC_WUFC_EXT_FLX21 BIT(21) /* Flexible Filter 21 Enable
> */
> -#define IGC_WUFC_EXT_FLX22 BIT(22) /* Flexible Filter 22 Enable
> */
> -#define IGC_WUFC_EXT_FLX23 BIT(23) /* Flexible Filter 23 Enable
> */
> -#define IGC_WUFC_EXT_FLX24 BIT(24) /* Flexible Filter 24 Enable
> */
> -#define IGC_WUFC_EXT_FLX25 BIT(25) /* Flexible Filter 25 Enable
> */
> -#define IGC_WUFC_EXT_FLX26 BIT(26) /* Flexible Filter 26 Enable
> */
> -#define IGC_WUFC_EXT_FLX27 BIT(27) /* Flexible Filter 27 Enable
> */
> -#define IGC_WUFC_EXT_FLX28 BIT(28) /* Flexible Filter 28 Enable
> */
> -#define IGC_WUFC_EXT_FLX29 BIT(29) /* Flexible Filter 29 Enable
> */
> -#define IGC_WUFC_EXT_FLX30 BIT(30) /* Flexible Filter 30 Enable
> */
> -#define IGC_WUFC_EXT_FLX31 BIT(31) /* Flexible Filter 31 Enable
> */
>
> #define IGC_WUFC_EXT_FILTER_MASK GENMASK(31, 8)
>
> --
> 2.47.3
Reviewed-by: Aleksandr Loktionov <aleksandr.loktionov@intel.com>
^ permalink raw reply [flat|nested] 4+ messages in thread