From patchwork Wed Jan 15 12:12:29 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: 11334135 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 E7830139A for ; Wed, 15 Jan 2020 12:18:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B94B3222C3 for ; Wed, 15 Jan 2020 12:18:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=silabs.onmicrosoft.com header.i=@silabs.onmicrosoft.com header.b="VK3jC2GO" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730690AbgAOMMl (ORCPT ); Wed, 15 Jan 2020 07:12:41 -0500 Received: from mail-co1nam11on2084.outbound.protection.outlook.com ([40.107.220.84]:24056 "EHLO NAM11-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1730667AbgAOMMj (ORCPT ); Wed, 15 Jan 2020 07:12:39 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CLcXEH/zSiNuU9B5w5J1iM/Ius5BvdDN45Nr8zGQLpyqbXPhmo4AoY4CTP4gOarYb54JjqzgTDA3w+i+f7Vutr524fSEFCKFcMkOkFW6hziDKyMKyTtMz9jiOgCXo/9I1tCl4hloVovE5TQD2wVl0c2dLqTAndbKoWEwNKagqKNRSa71v8+we3grQx614gsge1Zd/7YiR8yu2jNTD/nvr4Pdxe9+CAiUTTeCzNPGaMuEJvpknyF+dtjr0YiJhWuPAgIS/ueQLb+yMxOValV67U1gRiCCDQWb7tosa3v51r/OCtXzrYMZEg3ZSa4CA6Rz4JepchnhC9N66+4cpyXofw== 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=rMWYso2kX8M/LHUfsTraTHNa5REJyaaYdjFoAPnNI5Q=; b=P8zW3f9A4KwyB5uFYclpq4PSloFykOPDNVvijgp54zYq/jNTLiPEA3VHhlJRPn/j5jAO5vCAJOw4e1H1agEdNoNpgVdEdNSF20TBqDAyQGKhrN1JSnQRypciKj2e1abIEN2hlcSUaBySq/BDMtIGivTFHGRFP1mJ0j6c3N5WPxm7iUZCtNTj6AP/YzvwESYP3FJSndJMAKOw/NEgg3wgUHKvaFPgHpNJsMu4YkfeUxarHMRVYX//QiDKtgr5Bm/xNNvJJeEeiYg9P5RYeivPYT961iTQ932g56j16XTejCqsSclzkWLzy9QyvfcWOOqV0UT9fLqNyaDRmpdsIlX2Yw== 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=rMWYso2kX8M/LHUfsTraTHNa5REJyaaYdjFoAPnNI5Q=; b=VK3jC2GOzuvt4WSgzvVJw4YyMMJesLC5efgOlnKtMmQKk8z+MX663FE7pAg2fIyL3Z7ny8eOEFXlD6zMKSKgZ6gTXTNh1PfaXOVeCQimHqWzIJwvppBWq69Jg8r1GCbKErt6rhgMXT482YXlsPljobPdYggNDMBtt5eKGEqQCf0= 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:12:29 +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:12:29 +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:28 +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 15/65] staging: wfx: simplify wfx_config() Thread-Topic: [PATCH 15/65] staging: wfx: simplify wfx_config() Thread-Index: AQHVy50O4xaOBsjVYU+xG4wx4XJeDg== Date: Wed, 15 Jan 2020 12:12:29 +0000 Message-ID: <20200115121041.10863-16-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: 8837c3d2-bc35-4e14-c0e2-08d799b430fa x-ms-traffictypediagnostic: MN2PR11MB3934: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:2276; x-forefront-prvs: 02830F0362 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(39850400004)(396003)(136003)(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)(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: jIe7Jt4wN3GifHGqGBJZJJATusXENXbTwabQLGNy2JU2CxcYv3AryoghVyXlma2x+61LwIhYOyA4QwGpOF5sjSgzJwTDlknzt1pHcjyKhtcsdQL+2ieobt6f+4/zzh2BXKSBXLy2LcNJdL3Fh0+IxHjUtYmK1lOP2mQenhh2e0QmxLxeUjGSUbFnjgnqGoXT5XC6OXc8SemmVk8Ggd7u3wSmfBpzgagi4kzW7eAjnQ3yRtGV4ZoGucYWxE/EvWDBSRfp7IeSfn4g88drUHT4MD7Jvtts00a8IBmwDf+g/61jpIzk9HdYM+eOBV9F6QIOt05YDy3I1pxiVJhOa5Z291rYwmXHbkUqF/iAkcrKxukJRowRdS7s8UUtiABGu5wIxK8lBEje1c3s4Qp113Lcs0rfu94Caf/Q53UNjYD7u7TZMlzAXDo3Nzhg2zEgcJps Content-ID: MIME-Version: 1.0 X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8837c3d2-bc35-4e14-c0e2-08d799b430fa X-MS-Exchange-CrossTenant-originalarrivaltime: 15 Jan 2020 12:12:29.2946 (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: XLeTU/V2R9RNWhpW5ZEMFKpJw4GFOYLUUbtluf2p+t6AtEqrJzNpHZmdlW5fd1wZQoQhPkQjt8B9AhF8J6QlVg== 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 Now that wfx_config() only handles IEEE80211_CONF_CHANGE_PS, it can be simplified. Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/sta.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/drivers/staging/wfx/sta.c b/drivers/staging/wfx/sta.c index a0f19d33e972..451d0108a1b0 100644 --- a/drivers/staging/wfx/sta.c +++ b/drivers/staging/wfx/sta.c @@ -1230,22 +1230,13 @@ int wfx_config(struct ieee80211_hw *hw, u32 changed) struct wfx_dev *wdev = hw->priv; struct wfx_vif *wvif; - // FIXME: Interface id should not been hardcoded - wvif = wdev_to_wvif(wdev, 0); - if (!wvif) { - WARN(1, "interface 0 does not exist anymore"); - return 0; - } - - mutex_lock(&wdev->conf_mutex); if (changed & IEEE80211_CONF_CHANGE_PS) { + mutex_lock(&wdev->conf_mutex); wvif = NULL; while ((wvif = wvif_iterate(wdev, wvif)) != NULL) ret = wfx_update_pm(wvif); - wvif = wdev_to_wvif(wdev, 0); + mutex_unlock(&wdev->conf_mutex); } - - mutex_unlock(&wdev->conf_mutex); return ret; }