Revert "CHROMIUM: iwl7000: chromeOS: fix Intel regulatory (de)registration"

This reverts commit b4803ed63478. It caused the wifi driver to get into a reboot loop, which brought down shill since no wifi interface was present, implying no network connectivity (since ethernet/cellular need shill too atm) for 4.4 based boards. 

BUG=chromium:698394
TEST=manually booted and checked wifi on Electro

Change-Id: Ie2ea9948d1db42c692cbfb6e3fcfc6377c9b7746
Reviewed-on: https://chromium-review.googlesource.com/450092
Tested-by: Kirtika Ruchandani <kirtika@chromium.org>
Trybot-Ready: Kirtika Ruchandani <kirtika@chromium.org>
Reviewed-by: Kevin Cernekee <cernekee@chromium.org>
Commit-Queue: Kirtika Ruchandani <kirtika@chromium.org>
diff --git a/drivers/net/wireless/iwl7000/mac80211/main.c b/drivers/net/wireless/iwl7000/mac80211/main.c
index 9d31fcd..4171b22 100644
--- a/drivers/net/wireless/iwl7000/mac80211/main.c
+++ b/drivers/net/wireless/iwl7000/mac80211/main.c
@@ -1126,9 +1126,7 @@
 		goto fail_ifa6;
 #endif
 
-#if CFG80211_VERSION < KERNEL_VERSION(4,0,0)
 	intel_regulatory_register(local);
-#endif /* CFG80211_VERSION < KERNEL_VERSION(4,0,0) */
 
 	return 0;
 
@@ -1166,6 +1164,8 @@
 	tasklet_kill(&local->tx_pending_tasklet);
 	tasklet_kill(&local->tasklet);
 
+	intel_regulatory_deregister(local);
+
 #ifdef CONFIG_INET
 	unregister_inetaddr_notifier(&local->ifa_notifier);
 #endif
@@ -1235,10 +1235,6 @@
 
 	kfree(local->uapsd_black_list);
 
-#if CFG80211_VERSION < KERNEL_VERSION(4,0,0)
-	intel_regulatory_deregister(local);
-#endif /* CFG80211_VERSION < KERNEL_VERSION(4,0,0) */
-
 	wiphy_free(local->hw.wiphy);
 }
 EXPORT_SYMBOL(ieee80211_free_hw);