Commit 97489c28 authored by Brian Norris's avatar Brian Norris Committed by Kalle Valo

mwifiex: pcie: stop checking for NULL adapter->card

It should never be NULL here, and to think otherwise makes things
confusing.
Signed-off-by: default avatarBrian Norris <briannorris@chromium.org>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent e98fb11f
...@@ -3015,11 +3015,9 @@ static int mwifiex_register_dev(struct mwifiex_adapter *adapter) ...@@ -3015,11 +3015,9 @@ static int mwifiex_register_dev(struct mwifiex_adapter *adapter)
static void mwifiex_unregister_dev(struct mwifiex_adapter *adapter) static void mwifiex_unregister_dev(struct mwifiex_adapter *adapter)
{ {
struct pcie_service_card *card = adapter->card; struct pcie_service_card *card = adapter->card;
struct pci_dev *pdev; struct pci_dev *pdev = card->dev;
int i; int i;
if (card) {
pdev = card->dev;
if (card->msix_enable) { if (card->msix_enable) {
for (i = 0; i < MWIFIEX_NUM_MSIX_VECTORS; i++) for (i = 0; i < MWIFIEX_NUM_MSIX_VECTORS; i++)
synchronize_irq(card->msix_entries[i].vector); synchronize_irq(card->msix_entries[i].vector);
...@@ -3039,7 +3037,6 @@ static void mwifiex_unregister_dev(struct mwifiex_adapter *adapter) ...@@ -3039,7 +3037,6 @@ static void mwifiex_unregister_dev(struct mwifiex_adapter *adapter)
pci_disable_msi(pdev); pci_disable_msi(pdev);
} }
card->adapter = NULL; card->adapter = NULL;
}
} }
/* This function initializes the PCI-E host memory space, WCB rings, etc. /* This function initializes the PCI-E host memory space, WCB rings, etc.
...@@ -3122,7 +3119,6 @@ static void mwifiex_pcie_down_dev(struct mwifiex_adapter *adapter) ...@@ -3122,7 +3119,6 @@ static void mwifiex_pcie_down_dev(struct mwifiex_adapter *adapter)
adapter->seq_num = 0; adapter->seq_num = 0;
adapter->tx_buf_size = MWIFIEX_TX_DATA_BUF_SIZE_4K; adapter->tx_buf_size = MWIFIEX_TX_DATA_BUF_SIZE_4K;
if (card) {
if (reg->sleep_cookie) if (reg->sleep_cookie)
mwifiex_pcie_delete_sleep_cookie_buf(adapter); mwifiex_pcie_delete_sleep_cookie_buf(adapter);
...@@ -3131,9 +3127,6 @@ static void mwifiex_pcie_down_dev(struct mwifiex_adapter *adapter) ...@@ -3131,9 +3127,6 @@ static void mwifiex_pcie_down_dev(struct mwifiex_adapter *adapter)
mwifiex_pcie_delete_rxbd_ring(adapter); mwifiex_pcie_delete_rxbd_ring(adapter);
mwifiex_pcie_delete_txbd_ring(adapter); mwifiex_pcie_delete_txbd_ring(adapter);
card->cmdrsp_buf = NULL; card->cmdrsp_buf = NULL;
}
return;
} }
static struct mwifiex_if_ops pcie_ops = { static struct mwifiex_if_ops pcie_ops = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment