From 0da3282b1e50353ecc4ea36d69696b55d204c2c8 Mon Sep 17 00:00:00 2001 From: Emmanuel Grumbach Date: Mon, 10 Oct 2011 07:27:18 -0700 Subject: [PATCH] --- yaml --- r: 266755 b: refs/heads/master c: 397ede37a4defbe0000f2cc994fe9b7225f33c89 h: refs/heads/master i: 266753: 77036533ef8d0b01a43c439ef4def60de159f9c8 266751: 298bff5d324dbb069ef53835943fd98ce7d4c38f v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-core.c | 1 - trunk/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c | 5 +---- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 8278d4957b5e..579ba39fa40e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6a686c600268b71619f93d35f9373e2b6ab5947b +refs/heads/master: 397ede37a4defbe0000f2cc994fe9b7225f33c89 diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-core.c b/trunk/drivers/net/wireless/iwlwifi/iwl-core.c index abd0de4a0e43..b247a56d5135 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-core.c +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-core.c @@ -34,7 +34,6 @@ #include #include "iwl-eeprom.h" -#include "iwl-dev.h" /* FIXME: remove */ #include "iwl-debug.h" #include "iwl-core.h" #include "iwl-io.h" diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c b/trunk/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c index 0d7803b85af3..4a0c95302a7e 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c @@ -30,8 +30,6 @@ #include #include -/* TODO: remove include to iwl-dev.h */ -#include "iwl-dev.h" #include "iwl-debug.h" #include "iwl-csr.h" #include "iwl-prph.h" @@ -1020,9 +1018,8 @@ static int iwl_send_cmd_sync(struct iwl_trans *trans, struct iwl_host_cmd *cmd) HOST_COMPLETE_TIMEOUT); if (!ret) { if (test_bit(STATUS_HCMD_ACTIVE, &trans->shrd->status)) { - struct iwl_priv *priv = priv(trans); struct iwl_tx_queue *txq = - &trans_pcie->txq[priv->shrd->cmd_queue]; + &trans_pcie->txq[trans->shrd->cmd_queue]; struct iwl_queue *q = &txq->q; IWL_ERR(trans,