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
@@ -2145,8 +2145,6 @@ ath5k_get_chan_pcal_surrounding_piers(struct ath5k_hw *ah,
|
||||
done:
|
||||
*pcinfo_l = &pcinfo[idx_l];
|
||||
*pcinfo_r = &pcinfo[idx_r];
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
@@ -627,7 +627,6 @@ static void ath5k_hw_set_sleep_clock(struct ath5k_hw *ah, bool enable)
|
||||
|
||||
AR5K_REG_WRITE_BITS(ah, AR5K_TSF_PARM, AR5K_TSF_PARM_INC, 1);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
/* TODO: Half/Quarter rate */
|
||||
@@ -883,8 +882,6 @@ static void ath5k_hw_commit_eeprom_settings(struct ath5k_hw *ah,
|
||||
/* Heavy clipping -disable for now */
|
||||
if (ah->ah_ee_version >= AR5K_EEPROM_VERSION_5_1)
|
||||
ath5k_hw_reg_write(ah, 0, AR5K_PHY_HEAVY_CLIP_ENABLE);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
@@ -726,7 +726,6 @@ static void ar9003_hw_tx_iq_cal(struct ath_hw *ah)
|
||||
|
||||
TX_IQ_CAL_FAILED:
|
||||
ath_print(common, ATH_DBG_CALIBRATE, "Tx IQ Cal failed\n");
|
||||
return;
|
||||
}
|
||||
|
||||
static bool ar9003_hw_init_cal(struct ath_hw *ah,
|
||||
|
||||
@@ -86,7 +86,6 @@ static void ath9k_hw_update_nfcal_hist_buffer(struct ath9k_nfcal_hist *h,
|
||||
ath9k_hw_get_nf_hist_mid(h[i].nfCalBuffer);
|
||||
}
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
static bool ath9k_hw_get_nf_thresh(struct ath_hw *ah,
|
||||
|
||||
@@ -36,8 +36,6 @@ void ath9k_hw_analog_shift_rmw(struct ath_hw *ah, u32 reg, u32 mask,
|
||||
|
||||
if (ah->config.analog_shiftreg)
|
||||
udelay(100);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
int16_t ath9k_hw_interpolate(u16 target, u16 srcLeft, u16 srcRight,
|
||||
|
||||
@@ -50,7 +50,6 @@ static void ath9k_get_txgain_index(struct ath_hw *ah,
|
||||
i++;
|
||||
|
||||
*pcdacIdx = i;
|
||||
return;
|
||||
}
|
||||
|
||||
static void ath9k_olc_get_pdadcs(struct ath_hw *ah,
|
||||
@@ -751,8 +750,6 @@ static void ath9k_hw_get_def_gain_boundaries_pdadcs(struct ath_hw *ah,
|
||||
pPDADCValues[k] = pPDADCValues[k - 1];
|
||||
k++;
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
static int16_t ath9k_change_gain_boundary_setting(struct ath_hw *ah,
|
||||
|
||||
@@ -663,7 +663,6 @@ void ath9k_htc_rxep(void *drv_priv, struct sk_buff *skb,
|
||||
return;
|
||||
err:
|
||||
dev_kfree_skb_any(skb);
|
||||
return;
|
||||
}
|
||||
|
||||
/* FIXME: Locking for cleanup/init */
|
||||
|
||||
@@ -333,7 +333,6 @@ static void ath_reg_apply_world_flags(struct wiphy *wiphy,
|
||||
ath_reg_apply_active_scan_flags(wiphy, initiator);
|
||||
break;
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
int ath_reg_notifier_apply(struct wiphy *wiphy,
|
||||
|
||||
Reference in New Issue
Block a user