From patchwork Mon Dec 16 17:03:57 2019 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: 1210651 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=silabs.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=silabs.onmicrosoft.com header.i=@silabs.onmicrosoft.com header.b="W5Wg+Ve/"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 47c75G3nrpz9sRk for ; Tue, 17 Dec 2019 04:08:18 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727649AbfLPRIO (ORCPT ); Mon, 16 Dec 2019 12:08:14 -0500 Received: from mail-eopbgr690078.outbound.protection.outlook.com ([40.107.69.78]:42057 "EHLO NAM04-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727917AbfLPRHA (ORCPT ); Mon, 16 Dec 2019 12:07:00 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Y7LV0368xuxGkVGqg6x0w+Ywz6uKiMdBn1hitwF5CZiYBqvkBtc3axYD9CG8UeFELoXSw2EdIWd9l/g0MRbi0qTBsMhhqySCIYip0X3kLY1B04PoeXpcZf/NY7g/6i3cO+cbxkuSAj0X7xjdjhcHd985irsVdzjGjlTaqIblmuKOHeHHtHZabvVm3ajbJ8amWYmdkRWpm8ZEQK3Ix1e74XZ4BJDVey/8onatqQwnDS4PpZCSDQ9K6HY8rNIPj7tIlsnFxqO/VEubemdWBulePqI+G1NnVswXji4SzTV8n40s/qSdr6xESMjK466qwKegWfA/QOCk83siqcBkVwJB+Q== 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=JpekNFQ4BaFHhMa3F+Mu8dTR13JJLQ1MXOfdXlNJnzY=; b=jE6fzcXpCjRCHyBrnR/3VubjnL5KuaNv7K7xbheJs8kZZc9WL2uR59xXrSdXWu4yxDAenoczpUaj42LFNwY2ah96cJHoXe9Xs8ooXvk6IDx+wnMH+tQG8XUupOLmNyh+G94nyPYEoxz2L7NIWER06m9NYfLQvxQpp+MIFg8nvy6hqy8DMRxv4B0mtMLS3vFG70KBXRk4Y14WPosWHB8vMl1TYDIS8hIEQMnVJOvHeAWUvxjD9pbsSH8+SReO2+k1abgcSjy3W40xNIE4IzwewdbB0Rbln4OKUIuU935r2N6x9kT8XY5pPmU7sNDoOlYdPfhTDtDL8usMiJRqRNUAog== 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=JpekNFQ4BaFHhMa3F+Mu8dTR13JJLQ1MXOfdXlNJnzY=; b=W5Wg+Ve/x1jMdbo2Gx60w3eupdY7hpptR5bBmGICLvGj2DekrUUGxMcPtlkWWtzPGc3MIlcwm+Folhl3ixMyCcm2Q5wjuhl3PmMWEfhiKjbO6DiGBE6In+49TdMo3wUy89Z3wU4aZgnRB/Re4C5hZ2mdr13UhNeLut7EyMcG5cA= Received: from MN2PR11MB4063.namprd11.prod.outlook.com (10.255.180.22) by MN2PR11MB4142.namprd11.prod.outlook.com (20.179.149.157) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2538.15; Mon, 16 Dec 2019 17:06:46 +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.2538.019; Mon, 16 Dec 2019 17:06:46 +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?SsOpcsO0bWUgUG91?= =?utf-8?q?iller?= Subject: [PATCH 46/55] staging: wfx: drop useless wfx_scan_complete() Thread-Topic: [PATCH 46/55] staging: wfx: drop useless wfx_scan_complete() Thread-Index: AQHVtDLNVVOp3pR6kUO12tBC04f/PQ== Date: Mon, 16 Dec 2019 17:03:57 +0000 Message-ID: <20191216170302.29543-47-Jerome.Pouiller@silabs.com> References: <20191216170302.29543-1-Jerome.Pouiller@silabs.com> In-Reply-To: <20191216170302.29543-1-Jerome.Pouiller@silabs.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Jerome.Pouiller@silabs.com; x-originating-ip: [37.71.187.125] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: f92d0c9b-bb60-4ed9-146b-08d7824a554e x-ms-traffictypediagnostic: MN2PR11MB4142: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:747; x-forefront-prvs: 02530BD3AA x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(366004)(396003)(346002)(136003)(376002)(39850400004)(199004)(189003)(6512007)(71200400001)(91956017)(6486002)(8676002)(2906002)(54906003)(81166006)(81156014)(186003)(76116006)(478600001)(36756003)(85182001)(85202003)(6666004)(66556008)(66476007)(66446008)(64756008)(1076003)(66574012)(316002)(2616005)(4326008)(6506007)(26005)(8936002)(4744005)(110136005)(5660300002)(107886003)(66946007)(86362001); DIR:OUT; SFP:1101; SCL:1; SRVR:MN2PR11MB4142; 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: p9k4/EcUHKPY2RvfMXzJ59MpvomK8iZeoBGrD33ZCBtlYWnHERaBV858g1O6HEnCR2KHLqlil+s8Wo69TRI9u6Wnta3qZwjR3OVuwjFvLsDFliR1s+SmDv0BQx9ob4wTRmcZ+gpx3GvuuytAhRQEUdqKjpqTgYDk4Y7cw76FNVvG4qxoJIYrBlbAPhgwAXj4sLBbeWedw45qYbdh3A/R7qy2BMt5Rq6Z8fBX5VzLFKIYMHM5FUqZlMMam+qVO+2p0ZsqiUVfvTbfYhoLg4k3Ma+sfK1f+fgPNMFJm5ZvKumdMh2962eI9jJ7eN+pQwxS6almoIOQP7mPP2V8Kz+Yf/ws1yC0do+Ybeuw62GWQWqw0R6tB3JYOChloqgIt0LEz1iTAvFLY8ZZluN/3INi8FjXT0h2WdRV6CH64753fKu4D50EI5ELHcXQwLoxblX0 Content-ID: <5E8CE646798A7546A5123E6CEF6AA528@namprd11.prod.outlook.com> MIME-Version: 1.0 X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: f92d0c9b-bb60-4ed9-146b-08d7824a554e X-MS-Exchange-CrossTenant-originalarrivaltime: 16 Dec 2019 17:03:57.0276 (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: iZJkZNE0/JKGXrqDnWTbO4hhR17x5MXFUECnaRvZi3vrXVkhJH1Jpbe5BxWDSd/jKuTAqcnnJD7M+ZIfZNs7DA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB4142 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jérôme Pouiller Since wfx_scan_complete() is now only called from wfx_scan_complete_cb(), it make sense to merge the both functions. Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/scan.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/staging/wfx/scan.c b/drivers/staging/wfx/scan.c index 397fe511d34a..c043f2f79541 100644 --- a/drivers/staging/wfx/scan.c +++ b/drivers/staging/wfx/scan.c @@ -228,12 +228,6 @@ void wfx_scan_work(struct work_struct *work) schedule_work(&wvif->scan.work); } -static void wfx_scan_complete(struct wfx_vif *wvif) -{ - up(&wvif->scan.lock); - wfx_scan_work(&wvif->scan.work); -} - void wfx_scan_complete_cb(struct wfx_vif *wvif, const struct hif_ind_scan_cmpl *arg) { @@ -257,6 +251,7 @@ void wfx_scan_timeout(struct work_struct *work) wvif->scan.curr = wvif->scan.end; hif_stop_scan(wvif); } - wfx_scan_complete(wvif); + up(&wvif->scan.lock); + wfx_scan_work(&wvif->scan.work); } }