OSDN Git Service

mwifiex: pcie: remove unnecessary 'pdev' check
authorBrian Norris <briannorris@chromium.org>
Tue, 25 Jul 2017 01:13:34 +0000 (18:13 -0700)
committerKalle Valo <kvalo@codeaurora.org>
Fri, 28 Jul 2017 14:47:54 +0000 (17:47 +0300)
'card->dev' is initialized once and is never cleared. Drop the
unnecessary "safety" check, as it simply obscures things, and we don't
do this check everywhere (and therefore it's not really "safe").

Signed-off-by: Brian Norris <briannorris@chromium.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
drivers/net/wireless/marvell/mwifiex/pcie.c

index fc42697..3da1eeb 100644 (file)
@@ -2971,15 +2971,12 @@ static void mwifiex_cleanup_pcie(struct mwifiex_adapter *adapter)
                                    "Failed to write driver not-ready signature\n");
        }
 
-       if (pdev) {
-               pci_disable_device(pdev);
+       pci_disable_device(pdev);
 
-               pci_iounmap(pdev, card->pci_mmap);
-               pci_iounmap(pdev, card->pci_mmap1);
-               pci_disable_device(pdev);
-               pci_release_region(pdev, 2);
-               pci_release_region(pdev, 0);
-       }
+       pci_iounmap(pdev, card->pci_mmap);
+       pci_iounmap(pdev, card->pci_mmap1);
+       pci_release_region(pdev, 2);
+       pci_release_region(pdev, 0);
 
        mwifiex_pcie_free_buffers(adapter);
 }