From patchwork Wed Jan 15 12:13:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= X-Patchwork-Id: 11334025 X-Patchwork-Delegate: johannes@sipsolutions.net Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5731A139A for ; Wed, 15 Jan 2020 12:17:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2BA13207FF for ; Wed, 15 Jan 2020 12:17:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=silabs.onmicrosoft.com header.i=@silabs.onmicrosoft.com header.b="BZzYWldJ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732678AbgAOMRY (ORCPT ); Wed, 15 Jan 2020 07:17:24 -0500 Received: from mail-bn7nam10on2085.outbound.protection.outlook.com ([40.107.92.85]:6101 "EHLO NAM10-BN7-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1731173AbgAOMN2 (ORCPT ); Wed, 15 Jan 2020 07:13:28 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LfQ3RMOqVT8LtW0sbsf5gAt9+OmNVhlr+DCaqYqbbL4n2hLmW2nVerqI0Si2TjbM9Z27zMkNwcsAWKJ3VL5ym2/BDO7X2GLkk0VBq8XonW+VjgSGgiCXJZ4pWdihoiDPCk914GFYzfUo1OI+qiRhD5t/J9MCa/zM3eILPpKcPSUHaAZIUMqN7ptfCf2hTCsRGbePpy7D1g4o5htwifNIraBau1/eeTQrzxJVw8x0wgqzYs29yfoIESjY7pzbRmd2pUn5ViRmOn+tQtKXW+p2F2TJjjiYtK+krEGeFYBy5ipnNVATGbwqrks/dPMm0mf82KyJAuAlYY/tp8BS+yIZ4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=p7xw4WCj2d15OmRXMql5kVmIrhFJ5wVO8llOWfUVcAg=; b=NJdHTD4xtMtbXGiSsFSl8PMeofohy8TOKCTVBJIe9nysip+TwqRxeX69XIXUzrxdqWnueHLMqesimksfDdD+YpOQRfVDYODg0YisEcEogTitleOHkykM7tPrr2HGfcIhU3v8x86iDgJECa5c5almeAyEtHuyfwNnm2JJk8YXBmbzlP7xcS1bb7rib7KjwXYegtY80mm6vwlyYU2f+DjhG+RuWwzmXD1MoWVOx61ZFfqaYhjDV4u2JPt59o51mWu+aovENuHh1q469eC1ftK9S4dnC5sc6oz0B1BzgpRHb5AO73iEVzB1L/9I0ghHgnnZyrpZNZR0UJhImfLjilVhnw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=silabs.com; dmarc=pass action=none header.from=silabs.com; dkim=pass header.d=silabs.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=silabs.onmicrosoft.com; s=selector2-silabs-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=p7xw4WCj2d15OmRXMql5kVmIrhFJ5wVO8llOWfUVcAg=; b=BZzYWldJPihUjNluNMOcIHFgKycHDtb2avJnuof30NMxFpuxOFn0UfX/Uxl6MPyuJZBIKCwzwki5qISfn7uROqGEEqG96+Va4LoNl17Odkzq7b9UmNWf7EjdOn1Ymfv9NiBak4MlgJT7y8quYE0r8Jq8VLb1X8/ElJiW5H6wbf4= Received: from MN2PR11MB4063.namprd11.prod.outlook.com (10.255.180.22) by MN2PR11MB3934.namprd11.prod.outlook.com (10.255.180.212) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.20; Wed, 15 Jan 2020 12:13:25 +0000 Received: from MN2PR11MB4063.namprd11.prod.outlook.com ([fe80::f46c:e5b4:2a85:f0bf]) by MN2PR11MB4063.namprd11.prod.outlook.com ([fe80::f46c:e5b4:2a85:f0bf%4]) with mapi id 15.20.2623.018; Wed, 15 Jan 2020 12:13:25 +0000 Received: from pc-42.silabs.com (37.71.187.125) by PR2PR09CA0009.eurprd09.prod.outlook.com (2603:10a6:101:16::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.18 via Frontend Transport; Wed, 15 Jan 2020 12:12:59 +0000 From: =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= To: "devel@driverdev.osuosl.org" , "linux-wireless@vger.kernel.org" CC: "netdev@vger.kernel.org" , "linux-kernel@vger.kernel.org" , Greg Kroah-Hartman , Kalle Valo , "David S . Miller" , =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= Subject: [PATCH 39/65] staging: wfx: simplify wfx_scan_complete() Thread-Topic: [PATCH 39/65] staging: wfx: simplify wfx_scan_complete() Thread-Index: AQHVy50hZQc7OdNZT0aVGeI+gFYOqA== Date: Wed, 15 Jan 2020 12:13:01 +0000 Message-ID: <20200115121041.10863-40-Jerome.Pouiller@silabs.com> References: <20200115121041.10863-1-Jerome.Pouiller@silabs.com> In-Reply-To: <20200115121041.10863-1-Jerome.Pouiller@silabs.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: PR2PR09CA0009.eurprd09.prod.outlook.com (2603:10a6:101:16::21) To MN2PR11MB4063.namprd11.prod.outlook.com (2603:10b6:208:13f::22) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Jerome.Pouiller@silabs.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.25.0 x-originating-ip: [37.71.187.125] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 2d915965-17be-42d1-45f7-08d799b443e1 x-ms-traffictypediagnostic: MN2PR11MB3934: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:1360; x-forefront-prvs: 02830F0362 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(396003)(136003)(39860400002)(376002)(366004)(346002)(199004)(189003)(54906003)(110136005)(86362001)(956004)(107886003)(2616005)(316002)(36756003)(71200400001)(52116002)(7696005)(478600001)(8936002)(81156014)(8676002)(4326008)(81166006)(6486002)(2906002)(26005)(66946007)(16526019)(186003)(5660300002)(66574012)(1076003)(66556008)(64756008)(66446008)(6666004)(85182001)(66476007)(85202003);DIR:OUT;SFP:1101;SCL:1;SRVR:MN2PR11MB3934;H:MN2PR11MB4063.namprd11.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; received-spf: None (protection.outlook.com: silabs.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: M5UdNjyepYUXD5RottGyfoJ/k2yIxuZ0Bt+cagp+L7y+X25XC7DEmMHVkRlT2a3ZFqH0Tjcz7TOyzVg7VhM3Oc1WX+B7vaRynWr8KE/3lIsTIyGnpax7DZ/Dfr84tf+QE6wHKO0J15igctNFuV0BOTtSD9fF2cYYDFmybAqqedtqL+Avt17H13G9s4jErRhtfqjv6v7OGaUgla5/UOPv6jYq037iPxtFwVsUQMzM63qhKAiZ3bdt5jUgF1dL6V+o+gJ3eNevh+84aZlYJqpj9G3IONrNZBh7W8sU556xCj8B3bQhAUY47Sk3u11VAHLwXTW51UtqOKM39z8PnNh/zNYGEhZHVPyzxAcCm7vRRFXV4NWOEgWbfq8u5ooGNTIajF4tsimLx4tWzBtKrAerPJ/+A6UtntEPtlM8xHQ2hMvxE1basl8wuSW2e2/mqq2t Content-ID: <921C9397FCAF7F4585AF0A224DE77616@namprd11.prod.outlook.com> MIME-Version: 1.0 X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2d915965-17be-42d1-45f7-08d799b443e1 X-MS-Exchange-CrossTenant-originalarrivaltime: 15 Jan 2020 12:13:01.0103 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 54dbd822-5231-4b20-944d-6f4abcd541fb X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: N7nJc6Tq3DCt3mx4c9YFuq/v701tQiYKQgasTm7t/tGWYFjQml/LoQqD3UUa17Hs1RLU2MdJY2md/Cm+qinz2w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB3934 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Jérôme Pouiller wfx_scan_complete() do nothing with argument hif_ind_scan_cmpl. In add, hif_ind_scan_cmpl come from hardware API and is not expected to be used with upper layers of the driver. Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/hif_rx.c | 3 +-- drivers/staging/wfx/scan.c | 3 +-- drivers/staging/wfx/scan.h | 5 +---- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/drivers/staging/wfx/hif_rx.c b/drivers/staging/wfx/hif_rx.c index 408967a4c457..f04afc6db9a5 100644 --- a/drivers/staging/wfx/hif_rx.c +++ b/drivers/staging/wfx/hif_rx.c @@ -203,10 +203,9 @@ static int hif_scan_complete_indication(struct wfx_dev *wdev, const void *buf) { struct wfx_vif *wvif = wdev_to_wvif(wdev, hif->interface); - const struct hif_ind_scan_cmpl *body = buf; WARN_ON(!wvif); - wfx_scan_complete(wvif, body); + wfx_scan_complete(wvif); return 0; } diff --git a/drivers/staging/wfx/scan.c b/drivers/staging/wfx/scan.c index 5cc9df5eb6a1..6e1e50048651 100644 --- a/drivers/staging/wfx/scan.c +++ b/drivers/staging/wfx/scan.c @@ -127,8 +127,7 @@ void wfx_cancel_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif) hif_stop_scan(wvif); } -void wfx_scan_complete(struct wfx_vif *wvif, - const struct hif_ind_scan_cmpl *arg) +void wfx_scan_complete(struct wfx_vif *wvif) { complete(&wvif->scan_complete); } diff --git a/drivers/staging/wfx/scan.h b/drivers/staging/wfx/scan.h index bba9f15a9ff5..2eb786c9572c 100644 --- a/drivers/staging/wfx/scan.h +++ b/drivers/staging/wfx/scan.h @@ -10,8 +10,6 @@ #include -#include "hif_api_cmd.h" - struct wfx_dev; struct wfx_vif; @@ -19,7 +17,6 @@ void wfx_hw_scan_work(struct work_struct *work); int wfx_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif, struct ieee80211_scan_request *req); void wfx_cancel_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif); -void wfx_scan_complete(struct wfx_vif *wvif, - const struct hif_ind_scan_cmpl *ind); +void wfx_scan_complete(struct wfx_vif *wvif); #endif /* WFX_SCAN_H */