Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22450902 authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by John W. Linville
Browse files

iwlegacy: remove sync_cmd_mutex 



We now use priv->mutex to serialize sync command, remove old
priv->sync_cmd_mutex and add assertion that priv->mutex must be locked.

Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 28a6e577

drivers/net/wireless/iwlegacy/iwl-dev.h

+0 −1
Original line number Diff line number Diff line
@@ -1077,7 +1077,6 @@ struct iwl_priv { 
	spinlock_t hcmd_lock;	/* protect hcmd */

	spinlock_t reg_lock;	/* protect hw register access */

	struct mutex mutex;

	struct mutex sync_cmd_mutex; /* enable serialization of sync commands */



	/* basic pci-network driver stuff */

	struct pci_dev *pci_dev;

drivers/net/wireless/iwlegacy/iwl-hcmd.c

+2 −2
Original line number Diff line number Diff line
@@ -145,6 +145,8 @@ int iwl_legacy_send_cmd_sync(struct iwl_priv *priv, struct iwl_host_cmd *cmd) 
	int cmd_idx;

	int ret;



	lockdep_assert_held(&priv->mutex);



	BUG_ON(cmd->flags & CMD_ASYNC);



	 /* A synchronous command can not have a callback set. */
@@ -152,7 +154,6 @@ int iwl_legacy_send_cmd_sync(struct iwl_priv *priv, struct iwl_host_cmd *cmd) 


	IWL_DEBUG_INFO(priv, "Attempting to send sync command %s\n",

			iwl_legacy_get_cmd_string(cmd->id));

	mutex_lock(&priv->sync_cmd_mutex);



	set_bit(STATUS_HCMD_ACTIVE, &priv->status);

	IWL_DEBUG_INFO(priv, "Setting HCMD_ACTIVE for command %s\n",
@@ -224,7 +225,6 @@ int iwl_legacy_send_cmd_sync(struct iwl_priv *priv, struct iwl_host_cmd *cmd) 
		cmd->reply_page = 0;

	}

out:

	mutex_unlock(&priv->sync_cmd_mutex);

	return ret;

}

EXPORT_SYMBOL(iwl_legacy_send_cmd_sync);

drivers/net/wireless/iwlegacy/iwl3945-base.c

+0 −1
Original line number Diff line number Diff line
@@ -3815,7 +3815,6 @@ static int iwl3945_init_drv(struct iwl_priv *priv) 
	INIT_LIST_HEAD(&priv->free_frames);



	mutex_init(&priv->mutex);

	mutex_init(&priv->sync_cmd_mutex);



	priv->ieee_channels = NULL;

	priv->ieee_rates = NULL;

drivers/net/wireless/iwlegacy/iwl4965-base.c

+0 −1
Original line number Diff line number Diff line
@@ -3124,7 +3124,6 @@ static int iwl4965_init_drv(struct iwl_priv *priv) 
	INIT_LIST_HEAD(&priv->free_frames);



	mutex_init(&priv->mutex);

	mutex_init(&priv->sync_cmd_mutex);



	priv->ieee_channels = NULL;

	priv->ieee_rates = NULL;