drivers/net: Remove unnecessary returns from void function()s
This patch removes from drivers/net/ all the unnecessary
return; statements that precede the last closing brace of
void functions.
It does not remove the returns that are immediately
preceded by a label as gcc doesn't like that.
It also does not remove null void functions with return.
Done via:
$ grep -rP --include=*.[ch] -l "return;\n}" net/ | \
xargs perl -i -e 'local $/ ; while (<>) { s/\n[ \t\n]+return;\n}/\n}/g; print; }'
with some cleanups by hand.
Compile tested x86 allmodconfig only.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
committed by
David S. Miller
parent
21ce849ba5
commit
a4b770972b
@@ -488,7 +488,6 @@ static void ixgbe_dcbnl_setpfcstate(struct net_device *netdev, u8 state)
|
||||
if (adapter->temp_dcb_cfg.pfc_mode_enable !=
|
||||
adapter->dcb_cfg.pfc_mode_enable)
|
||||
adapter->dcb_set_bitmap |= BIT_PFC;
|
||||
return;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -1493,8 +1493,6 @@ static void ixgbe_free_desc_rings(struct ixgbe_adapter *adapter)
|
||||
tx_ring->tx_buffer_info = NULL;
|
||||
kfree(rx_ring->rx_buffer_info);
|
||||
rx_ring->rx_buffer_info = NULL;
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
static int ixgbe_setup_desc_rings(struct ixgbe_adapter *adapter)
|
||||
@@ -1973,8 +1971,6 @@ static void ixgbe_get_wol(struct net_device *netdev,
|
||||
wol->wolopts |= WAKE_BCAST;
|
||||
if (adapter->wol & IXGBE_WUFC_MAG)
|
||||
wol->wolopts |= WAKE_MAGIC;
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
static int ixgbe_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
|
||||
|
||||
@@ -1615,8 +1615,6 @@ static void ixgbe_set_itr_msix(struct ixgbe_q_vector *q_vector)
|
||||
|
||||
ixgbe_write_eitr(q_vector);
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
static void ixgbe_check_fan_failure(struct ixgbe_adapter *adapter, u32 eicr)
|
||||
@@ -2180,8 +2178,6 @@ static void ixgbe_set_itr(struct ixgbe_adapter *adapter)
|
||||
|
||||
ixgbe_write_eitr(q_vector);
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -4466,7 +4462,6 @@ static void ixgbe_reset_interrupt_capability(struct ixgbe_adapter *adapter)
|
||||
adapter->flags &= ~IXGBE_FLAG_MSI_ENABLED;
|
||||
pci_disable_msi(adapter->pdev);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user