hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mwifiex: stop checking for NULL drvata/intfdata 

These are never NULL, so stop making people think they might be.

I don't change this for SDIO because SDIO has a racy card-reset handler
that reallocates this struct. I'd rather not touch that mess right now.

Signed-off-by: Brian Norris <briannorris@chromium.org>
Tested-by: Xinming Hu <huxm@marvell.com>
Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
This commit is contained in:
Brian Norris 2016-11-18 19:30:33 +05:30 committed by Kalle Valo
parent 6caf34cb3a
commit e98fb11ffa
2 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/net/wireless/marvell/mwifiex/pcie.c
View File

@ -118,10 +118,6 @@ static int mwifiex_pcie_suspend(struct device *dev)
struct pci_dev *pdev = to_pci_dev(dev); struct pci_dev *pdev = to_pci_dev(dev);
card = pci_get_drvdata(pdev); card = pci_get_drvdata(pdev);
if (!card) {
dev_err(dev, "card structure is not valid\n");
return 0;
}
/* Might still be loading firmware */ /* Might still be loading firmware */
wait_for_completion(&card->fw_done); wait_for_completion(&card->fw_done);
@ -166,8 +162,9 @@ static int mwifiex_pcie_resume(struct device *dev)
struct pci_dev *pdev = to_pci_dev(dev); struct pci_dev *pdev = to_pci_dev(dev);
card = pci_get_drvdata(pdev); card = pci_get_drvdata(pdev);
if (!card || !card->adapter) {
dev_err(dev, "Card or adapter structure is not valid\n"); if (!card->adapter) {
dev_err(dev, "adapter structure is not valid\n");
return 0; return 0;
} }
@ -249,8 +246,6 @@ static void mwifiex_pcie_remove(struct pci_dev *pdev)
struct mwifiex_private *priv; struct mwifiex_private *priv;
card = pci_get_drvdata(pdev); card = pci_get_drvdata(pdev);
if (!card)
return;
wait_for_completion(&card->fw_done); wait_for_completion(&card->fw_done);
@ -2243,7 +2238,8 @@ static irqreturn_t mwifiex_pcie_interrupt(int irq, void *context)
} }
card = pci_get_drvdata(pdev); card = pci_get_drvdata(pdev);
if (!card || !card->adapter) {
if (!card->adapter) {
pr_err("info: %s: card=%p adapter=%p\n", __func__, card, pr_err("info: %s: card=%p adapter=%p\n", __func__, card,
card ? card->adapter : NULL); card ? card->adapter : NULL);
goto exit; goto exit;

15
drivers/net/wireless/marvell/mwifiex/usb.c
View File

@ -503,11 +503,6 @@ static int mwifiex_usb_suspend(struct usb_interface *intf, pm_message_t message)
struct usb_tx_data_port *port; struct usb_tx_data_port *port;
int i, j; int i, j;
if (!card) {
dev_err(&intf->dev, "%s: card is NULL\n", __func__);
return 0;
}
/* Might still be loading firmware */ /* Might still be loading firmware */
wait_for_completion(&card->fw_done); wait_for_completion(&card->fw_done);
@ -574,8 +569,9 @@ static int mwifiex_usb_resume(struct usb_interface *intf)
struct mwifiex_adapter *adapter; struct mwifiex_adapter *adapter;
int i; int i;
if (!card || !card->adapter) { if (!card->adapter) {
pr_err("%s: card or card->adapter is NULL\n", __func__); dev_err(&intf->dev, "%s: card->adapter is NULL\n",
__func__);
return 0; return 0;
} }
adapter = card->adapter; adapter = card->adapter;
@ -617,11 +613,6 @@ static void mwifiex_usb_disconnect(struct usb_interface *intf)
struct usb_card_rec *card = usb_get_intfdata(intf); struct usb_card_rec *card = usb_get_intfdata(intf);
struct mwifiex_adapter *adapter; struct mwifiex_adapter *adapter;
if (!card) {
dev_err(&intf->dev, "%s: card is NULL\n", __func__);
return;
}
wait_for_completion(&card->fw_done); wait_for_completion(&card->fw_done);
adapter = card->adapter; adapter = card->adapter;