From patchwork Thu Oct 30 04:17:09 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Larry Finger X-Patchwork-Id: 404874 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 95259140081 for ; Thu, 30 Oct 2014 15:17:59 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751859AbaJ3ERZ (ORCPT ); Thu, 30 Oct 2014 00:17:25 -0400 Received: from mail-pd0-f180.google.com ([209.85.192.180]:56583 "EHLO mail-pd0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751470AbaJ3ERY (ORCPT ); Thu, 30 Oct 2014 00:17:24 -0400 Received: by mail-pd0-f180.google.com with SMTP id ft15so4290217pdb.25 for ; Wed, 29 Oct 2014 21:17:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=/lNmFls9/FTlcskDdgAG0fZh26hGKUF5d7Vvvp42OBo=; b=jO8Z9I8pDM2vDE1wfLz48S2yH7iWK79fWHjoTB5exjqHAN2elrr3spxAoghsXHEzT/ gv1tyBr/fIOEZ9ZNn8MPhcCKf7/b7jsMJG/ToNjQ4x3BDhZIf4g8Gf5a751pwr1ZHxxn +AByYbq7q3TXiN0Es8cwf2Qb1s9YB4WBd6P3XYCGjZWQdkKL6gicROIdLYIyjcDdmRR3 TPbDgd2wAoVhA66vJOkCaIc2VbcQchV6SsZJhMHEqZZNc4mxkSCnoIIDEe9FGUllvbVG rmm9XduxIh2blQjCRmJL6JysIPbHHBPOqACyTA08neMpbr6a0clvtnsd8Ihtzb8npfTO zCFQ== X-Received: by 10.66.141.165 with SMTP id rp5mr14509500pab.121.1414642643610; Wed, 29 Oct 2014 21:17:23 -0700 (PDT) Received: from linux.site.site (104-9-16-198.lightspeed.renonv.sbcglobal.net. [104.9.16.198]) by mx.google.com with ESMTPSA id fv3sm5744931pac.7.2014.10.29.21.17.22 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 29 Oct 2014 21:17:23 -0700 (PDT) From: Larry Finger To: linville@tuxdriver.com Cc: linux-wireless@vger.kernel.org, Larry Finger , netdev@vger.kernel.org, Murilo Opsfelder Araujo Subject: [PATCH 2/6 V3.18] rtlwifi: rtl8192se: Fix duplicate calls to ieee80211_register_hw() Date: Wed, 29 Oct 2014 23:17:09 -0500 Message-Id: <1414642633-3700-3-git-send-email-Larry.Finger@lwfinger.net> X-Mailer: git-send-email 2.1.1 In-Reply-To: <1414642633-3700-1-git-send-email-Larry.Finger@lwfinger.net> References: <1414642633-3700-1-git-send-email-Larry.Finger@lwfinger.net> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Driver rtlwifi has been modified to call ieee80211_register_hw() from the probe routine; however, the existing call in the callback routine for deferred firmware loading was not removed. Signed-off-by: Larry Finger Cc: Murilo Opsfelder Araujo --- drivers/net/wireless/rtlwifi/rtl8192se/sw.c | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/sw.c b/drivers/net/wireless/rtlwifi/rtl8192se/sw.c index 5e16984..1fd2208 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192se/sw.c +++ b/drivers/net/wireless/rtlwifi/rtl8192se/sw.c @@ -87,11 +87,8 @@ static void rtl92s_init_aspm_vars(struct ieee80211_hw *hw) static void rtl92se_fw_cb(const struct firmware *firmware, void *context) { struct ieee80211_hw *hw = context; - struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw); struct rtl_priv *rtlpriv = rtl_priv(hw); - struct rtl_pci *rtlpci = rtl_pcidev(pcipriv); struct rt_firmware *pfirmware = NULL; - int err; RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD, "Firmware callback routine entered!\n"); @@ -112,20 +109,6 @@ static void rtl92se_fw_cb(const struct firmware *firmware, void *context) memcpy(pfirmware->sz_fw_tmpbuffer, firmware->data, firmware->size); pfirmware->sz_fw_tmpbufferlen = firmware->size; release_firmware(firmware); - - err = ieee80211_register_hw(hw); - if (err) { - RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, - "Can't register mac80211 hw\n"); - return; - } else { - rtlpriv->mac80211.mac80211_registered = 1; - } - rtlpci->irq_alloc = 1; - set_bit(RTL_STATUS_INTERFACE_START, &rtlpriv->status); - - /*init rfkill */ - rtl_init_rfkill(hw); } static int rtl92s_init_sw_vars(struct ieee80211_hw *hw)