From patchwork Thu Sep 26 18:25:28 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Larry Finger X-Patchwork-Id: 2950021 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id BCEFEBFF0B for ; Thu, 26 Sep 2013 18:26:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AC4A2201FF for ; Thu, 26 Sep 2013 18:26:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 15514201D5 for ; Thu, 26 Sep 2013 18:26:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754106Ab3IZS0k (ORCPT ); Thu, 26 Sep 2013 14:26:40 -0400 Received: from mail-oa0-f45.google.com ([209.85.219.45]:63123 "EHLO mail-oa0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753503Ab3IZS0E (ORCPT ); Thu, 26 Sep 2013 14:26:04 -0400 Received: by mail-oa0-f45.google.com with SMTP id o17so1166755oag.32 for ; Thu, 26 Sep 2013 11:26:04 -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=GssYFhHSaUlGJj+fFx0CulVAvNLnIcVCMeWsalWeIyM=; b=iAygGS6IIN3lZVtFPusSXZ4S9XKav0YAoWtUYUgqrczGOM9gOoCROn4938fhHAA75h xTRjb4dnVrfKtiGXCYNV556S68JMAPG27DdSQ+WyyxHLXsvnWCwdNZdoJDWc3ougPk6T dDNjj8HEprJwCDHyXE/aVhhXTFT+QbNthxgl+MOeId73LfeMDQO587mVhAHlxwT88nzg 07uullZU2tbeScs731aKhpSzg971mYRWzFur/YQWgZ9GaQLsp0760pAJbsjcLQp+8ymb Ot0KuF1A4+OiO+aD66CVTs7JIfDMxo9sgYRFw0aPCsJIw7toJBGy098hfJBasTGKR9ft kHUw== X-Received: by 10.182.39.161 with SMTP id q1mr2013490obk.54.1380219964011; Thu, 26 Sep 2013 11:26:04 -0700 (PDT) Received: from larrylap.lan (cpe-75-81-36-251.kc.res.rr.com. [75.81.36.251]) by mx.google.com with ESMTPSA id tz10sm4642575obc.10.1969.12.31.16.00.00 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 26 Sep 2013 11:26:03 -0700 (PDT) From: Larry Finger To: linville@tuxdriver.com Cc: linux-wireless@vger.kernel.org, Larry Finger , netdev@vger.kernel.org Subject: [PATCH 2/7] rtlwifi: rtl8192cu: Convert to use new rtl_phy_scan_operation_backup() routine Date: Thu, 26 Sep 2013 13:25:28 -0500 Message-Id: <1380219933-16784-3-git-send-email-Larry.Finger@lwfinger.net> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1380219933-16784-1-git-send-email-Larry.Finger@lwfinger.net> References: <1380219933-16784-1-git-send-email-Larry.Finger@lwfinger.net> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY, URIBL_BLACK autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Now that the routine exists in driver rtlwifi, convert rtl8192cu to use it. Signed-off-by: Larry Finger --- drivers/net/wireless/rtlwifi/rtl8192cu/sw.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c b/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c index 2bd5985..9936de7 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c +++ b/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c @@ -31,6 +31,7 @@ #include "../core.h" #include "../usb.h" #include "../efuse.h" +#include "../base.h" #include "reg.h" #include "def.h" #include "phy.h" @@ -117,7 +118,7 @@ static struct rtl_hal_ops rtl8192cu_hal_ops = { .set_bw_mode = rtl92c_phy_set_bw_mode, .switch_channel = rtl92c_phy_sw_chnl, .dm_watchdog = rtl92c_dm_watchdog, - .scan_operation_backup = rtl92c_phy_scan_operation_backup, + .scan_operation_backup = rtl_phy_scan_operation_backup, .set_rf_power_state = rtl92cu_phy_set_rf_power_state, .led_control = rtl92cu_led_control, .enable_hw_sec = rtl92cu_enable_hw_security_config,