From patchwork Mon Oct 31 08:02:19 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xinming Hu X-Patchwork-Id: 9405137 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 30B676022E for ; Mon, 31 Oct 2016 08:03:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 21C9429217 for ; Mon, 31 Oct 2016 08:03:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 158DA2922F; Mon, 31 Oct 2016 08:03:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8463729217 for ; Mon, 31 Oct 2016 08:03:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762009AbcJaIDK (ORCPT ); Mon, 31 Oct 2016 04:03:10 -0400 Received: from mail-pf0-f193.google.com ([209.85.192.193]:34915 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1762003AbcJaIDF (ORCPT ); Mon, 31 Oct 2016 04:03:05 -0400 Received: by mail-pf0-f193.google.com with SMTP id s8so8098065pfj.2 for ; Mon, 31 Oct 2016 01:03:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=PAohRQmtjfzuInOUoImAwbT3nJbhXDqx37JVGjMKj74=; b=RJG45N6eilDyaDkz7TG+nO8QIA7HeD2M/hfC5kx2iEI1/DSZTqMqxpmgz2ZrAHU0/P EKKT0sNAf7a8G/JzWAKS17OsGw4tcnEEgxDAzJW59tpu2+IGD7pfX1n58fDM/DeGbHJN OBqvGacNYKWp9hdW+jn5K6FNzf+lbgx0Tclj3Ft9wfcBKqi+9glSBVYFx/1sJ12BDL4/ wZn+zcTzw3s6bN6PeSNcZAt+wromObo4BhoOMR3iL2P/kA7Ift6WJPX45vHHf3jlRIs5 cayQjYDC3ERm0UV+AnuoAQH6DwNan48YGr0dU2Lf/btnAMuAVIjwJ+CVKjjzIwcdCGY3 LRuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=PAohRQmtjfzuInOUoImAwbT3nJbhXDqx37JVGjMKj74=; b=SG7Qk1d8+mvyh5Q+PXSflw70UeL6BGNHe3kMvz7JR6GcrAdqjOfA4FQgCsuMpEvy3F 4aUriPhmn+t0KWNg7K4hivmY3WaTTER+Zgja52y3rMWf5ytFqfaumVC+ieeP25KbcMaK BaIZX4bynFKlEcnduwd6zMaFAhZK8g2p1q72ai9Rdrg9xr5cexzb3tYUvygeq6+ip0xk aW4uhP4otzWn4jpe3mxSAyXGkWbSQeygwaABEjPD3zn+9bVVaeb5e4xDehMe5YzyChlz e2JpSOmHBjZ1jY/djX1udN4ZH+A0K7xmXsEkTYB9quCyVA0O31Zqi+ti8drB9Mus7gbU v7fQ== X-Gm-Message-State: ABUngvdKkP7JeIaklDOIJGV9IOP5OOCmT/sSoUW720zVbpl/WudnaZZoIv6UrqlrnbIR2w== X-Received: by 10.98.149.140 with SMTP id c12mr647182pfk.100.1477900983821; Mon, 31 Oct 2016 01:03:03 -0700 (PDT) Received: from localhost.localdomain ([216.207.47.6]) by smtp.gmail.com with ESMTPSA id k7sm34121196pan.8.2016.10.31.01.03.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 31 Oct 2016 01:03:03 -0700 (PDT) From: Xinming Hu X-Google-Original-From: Xinming Hu To: Linux Wireless Cc: Kalle Valo , Brian Norris , Dmitry Torokhov , Amitkumar Karwar , Cathy Luo , Brian Norris Subject: [PATCH 11/12] mwifiex: stop checking for NULL drvata/intfdata Date: Mon, 31 Oct 2016 16:02:19 +0800 Message-Id: <1477900940-10549-11-git-send-email-huxinming820@marvell.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1477900940-10549-1-git-send-email-huxinming820@marvell.com> References: <1477900940-10549-1-git-send-email-huxinming820@marvell.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Brian Norris 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 --- drivers/net/wireless/marvell/mwifiex/pcie.c | 14 +++++--------- drivers/net/wireless/marvell/mwifiex/usb.c | 15 +++------------ 2 files changed, 8 insertions(+), 21 deletions(-) diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c index 04b9961..c061d00 100644 --- a/drivers/net/wireless/marvell/mwifiex/pcie.c +++ b/drivers/net/wireless/marvell/mwifiex/pcie.c @@ -102,10 +102,6 @@ static int mwifiex_pcie_suspend(struct device *dev) struct pci_dev *pdev = to_pci_dev(dev); card = pci_get_drvdata(pdev); - if (!card) { - dev_err(dev, "adapter structure is not valid\n"); - return 0; - } /* Might still be loading firmware */ wait_for_completion(&card->fw_done); @@ -148,8 +144,9 @@ static int mwifiex_pcie_resume(struct device *dev) struct pci_dev *pdev = to_pci_dev(dev); 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; } @@ -222,8 +219,6 @@ static void mwifiex_pcie_remove(struct pci_dev *pdev) struct mwifiex_private *priv; card = pci_get_drvdata(pdev); - if (!card) - return; wait_for_completion(&card->fw_done); @@ -2216,7 +2211,8 @@ static irqreturn_t mwifiex_pcie_interrupt(int irq, void *context) } card = pci_get_drvdata(pdev); - if (!card || !card->adapter) { + + if (!card->adapter) { pr_err("info: %s: card=%p adapter=%p\n", __func__, card, card ? card->adapter : NULL); goto exit; diff --git a/drivers/net/wireless/marvell/mwifiex/usb.c b/drivers/net/wireless/marvell/mwifiex/usb.c index c26daf4..78b46fa 100644 --- a/drivers/net/wireless/marvell/mwifiex/usb.c +++ b/drivers/net/wireless/marvell/mwifiex/usb.c @@ -503,11 +503,6 @@ static int mwifiex_usb_suspend(struct usb_interface *intf, pm_message_t message) struct usb_tx_data_port *port; int i, j; - if (!card) { - dev_err(&intf->dev, "%s: card is NULL\n", __func__); - return 0; - } - /* Might still be loading firmware */ wait_for_completion(&card->fw_done); @@ -574,8 +569,9 @@ static int mwifiex_usb_resume(struct usb_interface *intf) struct mwifiex_adapter *adapter; int i; - if (!card || !card->adapter) { - pr_err("%s: card or card->adapter is NULL\n", __func__); + if (!card->adapter) { + dev_err(&intf->dev, "%s: card->adapter is NULL\n", + __func__); return 0; } 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 mwifiex_adapter *adapter; - if (!card) { - dev_err(&intf->dev, "%s: card is NULL\n", __func__); - return; - } - wait_for_completion(&card->fw_done); adapter = card->adapter;