From patchwork Fri May 12 16:42:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Norris X-Patchwork-Id: 9724613 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 0AEAA601E7 for ; Fri, 12 May 2017 16:44:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EBC6428854 for ; Fri, 12 May 2017 16:44:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DF26D2885E; Fri, 12 May 2017 16:44:05 +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, RCVD_IN_DNSWL_HI autolearn=unavailable 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 815CF28854 for ; Fri, 12 May 2017 16:44:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933263AbdELQme (ORCPT ); Fri, 12 May 2017 12:42:34 -0400 Received: from mail-pg0-f49.google.com ([74.125.83.49]:35127 "EHLO mail-pg0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933250AbdELQmc (ORCPT ); Fri, 12 May 2017 12:42:32 -0400 Received: by mail-pg0-f49.google.com with SMTP id q125so13291041pgq.2 for ; Fri, 12 May 2017 09:42:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=kkbyn+4Cy7fu5jjB1M+Bg1D9ARGxnKgz163uJFY4RHc=; b=DS0OCrFVO+QSlyswSnzpedIDwrtGGyfaua95o7ArdrMNaW2JPsvdVhng3APfLu2+S6 fMFdsk4sF1nhjvQNAApPgqQSIRtGGLVp2a7GqBiN9JloO6SrE7eHsCvTHAFbwZBrDUJj 8M8Hvfkld+9w7cRtxMgOH3D1AeZAeNAEsmqf0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=kkbyn+4Cy7fu5jjB1M+Bg1D9ARGxnKgz163uJFY4RHc=; b=dKqHIcXhQT9E7F5izuQPYBO3sb7x9+k64LH29pCUacPA7s8ZEISYEc5Tjjibn0F9f9 ddrGv2v6kjw7N5Jq/Y7D1UunKWzWPDb9IRLIquBnCW25v8iOycPAva83orAZL2wJ9hvo fO+Zr0tjWN8gveEqQq5A7IPDN92Ib5XMxA6QcEueTfN8dUE2RWSm4R3ujbW1SEsZ0nkS RZpsFqQ+mj/gP7BDdfZ4sO0sEsuhwWjeq3ud7hG6GO8hlQyUr1YoSyOiGwtEecK+4W7T YXE1aJWWXREHs/2dmIJQ08aBHKQRyCSIf3S8n2YU0h/tKLI3gj7RYYOiS7QsWqchBQoZ oAlw== X-Gm-Message-State: AODbwcDMsUsJZGhIrG3Bibcwl99/XnorlOHsnqpotYggufYZzubOaXFl 2mOnnd2Cud6xs6PN X-Received: by 10.84.142.133 with SMTP id 5mr7102626plx.52.1494607351691; Fri, 12 May 2017 09:42:31 -0700 (PDT) Received: from ban.mtv.corp.google.com ([172.22.64.120]) by smtp.gmail.com with ESMTPSA id u74sm7304499pfk.58.2017.05.12.09.42.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 12 May 2017 09:42:31 -0700 (PDT) From: Brian Norris To: Ganapathi Bhat , Nishant Sarmukadam Cc: , Dmitry Torokhov , Amitkumar Karwar , Kalle Valo , linux-wireless@vger.kernel.org, Doug Anderson , Brian Norris Subject: [PATCH 08/11] mwifiex: remove redundant 'adapter' check in mwifiex_adapter_cleanup Date: Fri, 12 May 2017 09:42:05 -0700 Message-Id: <20170512164208.38725-8-briannorris@chromium.org> X-Mailer: git-send-email 2.13.0.rc2.291.g57267f2277-goog In-Reply-To: <20170512164208.38725-1-briannorris@chromium.org> References: <20170512164208.38725-1-briannorris@chromium.org> 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 We're using 'adapter' right before calling this. Stop being unnecessarily paranoid. Signed-off-by: Brian Norris --- drivers/net/wireless/marvell/mwifiex/init.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/net/wireless/marvell/mwifiex/init.c b/drivers/net/wireless/marvell/mwifiex/init.c index 2bff87bd76a6..80bdf1c5f77f 100644 --- a/drivers/net/wireless/marvell/mwifiex/init.c +++ b/drivers/net/wireless/marvell/mwifiex/init.c @@ -409,11 +409,6 @@ static void mwifiex_free_lock_list(struct mwifiex_adapter *adapter) static void mwifiex_adapter_cleanup(struct mwifiex_adapter *adapter) { - if (!adapter) { - pr_err("%s: adapter is NULL\n", __func__); - return; - } - del_timer(&adapter->wakeup_timer); mwifiex_cancel_all_pending_cmd(adapter); wake_up_interruptible(&adapter->cmd_wait_q.wait);