1 files changed, 1 insertions, 40 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-rfkill.c b/drivers/net/wireless/iwlwifi/iwl-rfkill.c
index ffefbb487e12..aa9f31eadab2 100644
--- a/drivers/net/wireless/iwlwifi/iwl-rfkill.c
+++ b/drivers/net/wireless/iwlwifi/iwl-rfkill.c
@@ -50,7 +50,7 @@ static int iwl_rfkill_soft_rf_kill(void *data, enum rfkill_state state)
         if (test_bit(STATUS_EXIT_PENDING, &priv->status))
                 return 0;
 
-        IWL_DEBUG_RF_KILL("we recieved soft RFKILL set to state %d\n", state);
+        IWL_DEBUG_RF_KILL("we received soft RFKILL set to state %d\n", state);
         mutex_lock(&priv->mutex);
 
         switch (state) {
@@ -98,36 +98,11 @@ int iwl_rfkill_init(struct iwl_priv *priv)
         priv->rfkill_mngr.rfkill->dev.class->suspend = NULL;
         priv->rfkill_mngr.rfkill->dev.class->resume = NULL;
 
-#if defined(CONFIG_RFKILL_INPUT) || defined(CONFIG_RFKILL_INPUT_MODULE)
-        priv->rfkill_mngr.input_dev = input_allocate_device();
-        if (!priv->rfkill_mngr.input_dev) {
-                IWL_ERROR("Unable to allocate rfkill input device.\n");
-                ret = -ENOMEM;
-                goto freed_rfkill;
-        }
-
-        priv->rfkill_mngr.input_dev->name = priv->cfg->name;
-        priv->rfkill_mngr.input_dev->phys = wiphy_name(priv->hw->wiphy);
-        priv->rfkill_mngr.input_dev->id.bustype = BUS_HOST;
-        priv->rfkill_mngr.input_dev->id.vendor = priv->pci_dev->vendor;
-        priv->rfkill_mngr.input_dev->dev.parent = device;
-        priv->rfkill_mngr.input_dev->evbit[0] = BIT(EV_KEY);
-        set_bit(KEY_WLAN, priv->rfkill_mngr.input_dev->keybit);
-#endif
-
         ret = rfkill_register(priv->rfkill_mngr.rfkill);
         if (ret) {
                 IWL_ERROR("Unable to register rfkill: %d\n", ret);
-                goto free_input_dev;
-        }
-
-#if defined(CONFIG_RFKILL_INPUT) || defined(CONFIG_RFKILL_INPUT_MODULE)
-        ret = input_register_device(priv->rfkill_mngr.input_dev);
-        if (ret) {
-                IWL_ERROR("Unable to register rfkill input device: %d\n", ret);
                 goto unregister_rfkill;
         }
-#endif
 
         IWL_DEBUG_RF_KILL("RFKILL initialization complete.\n");
         return ret;
@@ -136,12 +111,6 @@ unregister_rfkill:
         rfkill_unregister(priv->rfkill_mngr.rfkill);
         priv->rfkill_mngr.rfkill = NULL;
 
-free_input_dev:
-#if defined(CONFIG_RFKILL_INPUT) || defined(CONFIG_RFKILL_INPUT_MODULE)
-        input_free_device(priv->rfkill_mngr.input_dev);
-        priv->rfkill_mngr.input_dev = NULL;
-#endif
-
 freed_rfkill:
         if (priv->rfkill_mngr.rfkill != NULL)
                 rfkill_free(priv->rfkill_mngr.rfkill);
@@ -156,13 +125,6 @@ EXPORT_SYMBOL(iwl_rfkill_init);
 void iwl_rfkill_unregister(struct iwl_priv *priv)
 {
 
-#if defined(CONFIG_RFKILL_INPUT) || defined(CONFIG_RFKILL_INPUT_MODULE)
-        if (priv->rfkill_mngr.input_dev)
-                input_unregister_device(priv->rfkill_mngr.input_dev);
-        input_free_device(priv->rfkill_mngr.input_dev);
-        priv->rfkill_mngr.input_dev = NULL;
-#endif
-
         if (priv->rfkill_mngr.rfkill)
                 rfkill_unregister(priv->rfkill_mngr.rfkill);
 
@@ -173,7 +135,6 @@ EXPORT_SYMBOL(iwl_rfkill_unregister);
 /* set rf-kill to the right state. */
 void iwl_rfkill_set_hw_state(struct iwl_priv *priv)
 {
-
         if (!priv->rfkill_mngr.rfkill)
                 return;