mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2025-01-18 03:44:27 +08:00
iwlagn: simplify iwl_alloc_all
The iwl_alloc_all routine is only called once. Delete the argument and print an error in the calling routine if needed. Signed-off-by: Don Fry <donald.h.fry@intel.com> Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
8c3d11617d
commit
fa06ec7944
@ -3178,7 +3178,7 @@ static int iwl_set_hw_params(struct iwl_priv *priv)
|
||||
}
|
||||
|
||||
/* This function both allocates and initializes hw and priv. */
|
||||
static struct ieee80211_hw *iwl_alloc_all(struct iwl_cfg *cfg)
|
||||
static struct ieee80211_hw *iwl_alloc_all(void)
|
||||
{
|
||||
struct iwl_priv *priv;
|
||||
/* mac80211 allocates memory for this device instance, including
|
||||
@ -3186,11 +3186,8 @@ static struct ieee80211_hw *iwl_alloc_all(struct iwl_cfg *cfg)
|
||||
struct ieee80211_hw *hw;
|
||||
|
||||
hw = ieee80211_alloc_hw(sizeof(struct iwl_priv), &iwlagn_hw_ops);
|
||||
if (hw == NULL) {
|
||||
pr_err("%s: Can not allocate network device\n",
|
||||
cfg->name);
|
||||
if (!hw)
|
||||
goto out;
|
||||
}
|
||||
|
||||
priv = hw->priv;
|
||||
priv->hw = hw;
|
||||
@ -3211,8 +3208,9 @@ int iwl_probe(struct iwl_bus *bus, const struct iwl_trans_ops *trans_ops,
|
||||
/************************
|
||||
* 1. Allocating HW data
|
||||
************************/
|
||||
hw = iwl_alloc_all(cfg);
|
||||
hw = iwl_alloc_all();
|
||||
if (!hw) {
|
||||
pr_err("%s: Cannot allocate network device\n", cfg->name);
|
||||
err = -ENOMEM;
|
||||
goto out;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user