---

yaml
---
r: 277599
b: refs/heads/master
c: fa06ec7
h: refs/heads/master
i:
  277597: 80957ad
  277595: 3858cfe
  277591: 9eeac57
  277583: dd17606
  277567: 214ca8e
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8c3d11617d61c0b69e029fd4087370bc8cb2218d
+refs/heads/master: fa06ec7944897e0b9d10097e8d8b140357af1845

trunk/drivers/net/wireless/iwlwifi/iwl-agn.c

@@ -3178,19 +3178,16 @@ 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
 	 *   space for this driver's private structure */
 	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;
 	}