Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1583040

[RFC 5/5] iwlwifi: convert final opmode work into a workqueue

From "Luis R. Rodriguez" <mcgrof@kernel.org>
Newsgroups linux.kernel
Subject [RFC 5/5] iwlwifi: convert final opmode work into a workqueue
Date 2017-02-17 03:20 +0100
Message-ID <tbGjo-6so-25@gated-at.bofh.it> (permalink)
References <tbGjn-6so-3@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw


This lets us offload and share all the final opmode related work
necessary for either an opmode driver or new device. This has the most
impact for opmode drivers as this now offloads opmode start for each
device onto the workqueue.

Signed-off-by: Luis R. Rodriguez <mcgrof@kernel.org>
---
 drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
index 6cfbc3c6e0d6..d39a5c73afdc 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
@@ -145,6 +145,8 @@ static struct iwlwifi_opmode_table {
 	[DVM_OP_MODE] = { .name = "iwldvm", .ops = NULL },
 	[MVM_OP_MODE] = { .name = "iwlmvm", .ops = NULL },
 };
+static void iwlwifi_opmode_dowork(struct work_struct *work);
+static DECLARE_WORK(iwlwifi_opmode_work, iwlwifi_opmode_dowork);
 
 #define IWL_DEFAULT_SCAN_CHANNELS 40
 
@@ -1291,7 +1293,7 @@ static void iwlwifi_opmode_start(struct iwlwifi_opmode_table *op)
 		iwlwifi_opmode_start_drv(op, drv);
 }
 
-static void iwlwifi_opmode_dowork(void)
+static void iwlwifi_opmode_dowork(struct work_struct *unused_work)
 {
 	unsigned int i;
 	struct iwlwifi_opmode_table *op;
@@ -1530,7 +1532,7 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context)
 
 	mutex_unlock(&iwlwifi_opmode_table_mtx);
 
-	iwlwifi_opmode_dowork();
+	schedule_work(&iwlwifi_opmode_work);
 	goto free;
 
  try_again:
@@ -1614,6 +1616,7 @@ struct iwl_drv *iwl_drv_start(struct iwl_trans *trans)
 void iwl_drv_stop(struct iwl_drv *drv)
 {
 	wait_for_completion(&drv->request_firmware_complete);
+	cancel_work_sync(&iwlwifi_opmode_work);
 
 	_iwl_op_mode_stop(drv);
 
@@ -1667,7 +1670,7 @@ int iwl_opmode_register(const char *name, const struct iwl_op_mode_ops *ops)
 	mutex_unlock(&iwlwifi_opmode_table_mtx);
 
 	if (!ret)
-		iwlwifi_opmode_dowork();
+		schedule_work(&iwlwifi_opmode_work);
 
 	return ret;
 }
-- 
2.11.0

Back to linux.kernel | Previous | NextPrevious in thread | Find similar | Unroll thread


Thread

[RFC 0/5] iwlwifi: enhance final opmode work "Luis R. Rodriguez" <mcgrof@kernel.org> - 2017-02-17 03:20 +0100
  [RFC 2/5] iwlwifi: fix request_module() use "Luis R. Rodriguez" <mcgrof@kernel.org> - 2017-02-17 03:20 +0100
    RE: [RFC 2/5] iwlwifi: fix request_module() use "Grumbach, Emmanuel" <emmanuel.grumbach@intel.com> - 2017-02-19 10:50 +0100
      Re: [RFC 2/5] iwlwifi: fix request_module() use "Luis R. Rodriguez" <mcgrof@kernel.org> - 2017-02-21 03:30 +0100
        RE: [RFC 2/5] iwlwifi: fix request_module() use "Grumbach, Emmanuel" <emmanuel.grumbach@intel.com> - 2017-02-21 08:20 +0100
          Re: [RFC 2/5] iwlwifi: fix request_module() use "Luis R. Rodriguez" <mcgrof@kernel.org> - 2017-02-21 19:20 +0100
            Re: [RFC 2/5] iwlwifi: fix request_module() use "Luis R. Rodriguez" <mcgrof@kernel.org> - 2017-02-21 21:20 +0100
              Re: [RFC 2/5] iwlwifi: fix request_module() use "Luis R. Rodriguez" <mcgrof@kernel.org> - 2017-02-22 01:20 +0100
                [PATCH v2 0/2] iwlwifi: share opmode start code "Luis R. Rodriguez" <mcgrof@kernel.org> - 2017-02-22 03:20 +0100
                [PATCH v2 2/2] iwlwifi: convert final opmode work into a workqueue "Luis R. Rodriguez" <mcgrof@kernel.org> - 2017-02-22 03:20 +0100
                [PATCH v2 1/2] iwlwifi: share opmode start work code "Luis R. Rodriguez" <mcgrof@kernel.org> - 2017-02-22 03:20 +0100
                [PATCH v2 1/2] iwlwifi: fix drv cleanup on opmode registration failure "Luis R. Rodriguez" <mcgrof@kernel.org> - 2017-02-22 03:20 +0100
                [PATCH v2 0/2] iwlwifi: corner case fix and request module changes "Luis R. Rodriguez" <mcgrof@kernel.org> - 2017-02-22 03:20 +0100
                [PATCH v2 2/2] iwlwifi: simplify requesting ops module "Luis R. Rodriguez" <mcgrof@kernel.org> - 2017-02-22 03:20 +0100
  [RFC 1/5] iwlwifi: fix drv cleanup on opmode registration failure "Luis R. Rodriguez" <mcgrof@kernel.org> - 2017-02-17 03:20 +0100
    RE: [RFC 1/5] iwlwifi: fix drv cleanup on opmode registration  failure "Grumbach, Emmanuel" <emmanuel.grumbach@intel.com> - 2017-02-19 10:20 +0100
      Re: [RFC 1/5] iwlwifi: fix drv cleanup on opmode registration failure "Luis R. Rodriguez" <mcgrof@kernel.org> - 2017-02-20 18:40 +0100
  [RFC 3/5] iwlwifi: share opmode start work code "Luis R. Rodriguez" <mcgrof@kernel.org> - 2017-02-17 03:20 +0100
  [RFC 5/5] iwlwifi: convert final opmode work into a workqueue "Luis R. Rodriguez" <mcgrof@kernel.org> - 2017-02-17 03:20 +0100

csiph-web