diff options
| author | Amitkumar Karwar | 2016-11-18 15:00:27 +0100 |
|---|---|---|
| committer | Kalle Valo | 2016-11-19 08:18:48 +0100 |
| commit | a1beec4b2c6f74365e469df08270a3b847006bec (patch) | |
| tree | 76f24f4f46e2ce48e81ebb409b8cdc1ccdfb9821 /drivers/net/wireless/marvell/mwifiex/pcie.c | |
| parent | mwifiex: resolve races between async FW init (failure) and device removal (diff) | |
| download | kernel-qcow2-linux-a1beec4b2c6f74365e469df08270a3b847006bec.tar.gz kernel-qcow2-linux-a1beec4b2c6f74365e469df08270a3b847006bec.tar.xz kernel-qcow2-linux-a1beec4b2c6f74365e469df08270a3b847006bec.zip | |
mwifiex: remove redundant pdev check in suspend/resume handlers
to_pci_dev() would just do struct offset arithmetic on struct
device to get 'pdev' pointer. We never get NULL pdev pointer.
Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Tested-by: Xinming Hu <huxm@marvell.com>
Signed-off-by: Brian Norris <briannorris@chromium.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Diffstat (limited to 'drivers/net/wireless/marvell/mwifiex/pcie.c')
| -rw-r--r-- | drivers/net/wireless/marvell/mwifiex/pcie.c | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c index 547806f8f923..86ae0841aa70 100644 --- a/drivers/net/wireless/marvell/mwifiex/pcie.c +++ b/drivers/net/wireless/marvell/mwifiex/pcie.c @@ -117,14 +117,9 @@ static int mwifiex_pcie_suspend(struct device *dev) struct pcie_service_card *card; struct pci_dev *pdev = to_pci_dev(dev); - if (pdev) { - card = pci_get_drvdata(pdev); - if (!card || !card->adapter) { - pr_err("Card or adapter structure is not valid\n"); - return 0; - } - } else { - pr_err("PCIE device is not specified\n"); + card = pci_get_drvdata(pdev); + if (!card || !card->adapter) { + pr_err("Card or adapter structure is not valid\n"); return 0; } @@ -162,14 +157,9 @@ static int mwifiex_pcie_resume(struct device *dev) struct pcie_service_card *card; struct pci_dev *pdev = to_pci_dev(dev); - if (pdev) { - card = pci_get_drvdata(pdev); - if (!card || !card->adapter) { - pr_err("Card or adapter structure is not valid\n"); - return 0; - } - } else { - pr_err("PCIE device is not specified\n"); + card = pci_get_drvdata(pdev); + if (!card || !card->adapter) { + dev_err(dev, "Card or adapter structure is not valid\n"); return 0; } |