From patchwork Tue Dec 17 16:15:19 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: 1211516 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="cJurI9kj"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 47cjxg4FRtz9sSF for ; Wed, 18 Dec 2019 03:18:47 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729291AbfLQQSf (ORCPT ); Tue, 17 Dec 2019 11:18:35 -0500 Received: from mail-bn8nam11on2041.outbound.protection.outlook.com ([40.107.236.41]:6164 "EHLO NAM11-BN8-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728959AbfLQQPu (ORCPT ); Tue, 17 Dec 2019 11:15:50 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PaoJZGR/y8WR5PuoajiMbvyW9R5WrwLQyiCA7489ISX47WErEgC4zYKe/TxN5fgsDuk1MVufLMUrbiPeMz+qXqCUTbmVYq8QJqbUA+/o4Uln9ftQ6WcsbmLHh1F3mEDVZkzUOBdjaVA1abcwq/m/ijeRdFATqsZR3FIbwodpsjRZZ1+maKwUjvHzAMpD9WhV+OQXtlru1Knhwjbu53gNvmKXSNXRMH9IoH5F2ROLxagxt4dkpGN6Q4EYhtAVdnXcT3uXIsqNfg7XV4vYdUdCynAVUNmAbJdFQj1f9h0IGYmKlloaUiL1UTw7m9v+Vh6ugloOktR1xQBYf/+nTaFRaA== 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=d6JE+ScPoQgbxTngVfkGUoTAsmuuz8DyIHnJzKHImn0=; b=bgelZaT6lBKBePakoWxjr9dNIYz22d56k+mt7bN1tiW2UCoW7y4u9KbiQgwQWMsp3SNOsXiVvaraIuFhHBqdTEYxKPfvJOeNyNfRNJIt18VoIkU4AhdIwr+SHXq00Ca60Zr6mNU4A9gZCf/qYGyGuxlhO4ZXn53jxTH9Ric6vVq5yCZqswZb379nJBxzcPuF7oy+C/CskyzldtqgLdYGDRA+WHAsRSxV0YDSo6R6/sz8xvpIVnoVjarsVW99GopK1s2uEDfj/UL1+NsYR5qdcG6zatCI271AHtwpb+7IcvSEfhFn2hGygboZlk6oS5qJPezUC9/5luRQIp0vodlSTA== 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=d6JE+ScPoQgbxTngVfkGUoTAsmuuz8DyIHnJzKHImn0=; b=cJurI9kj/g4sXdGCtalPj65FNrK8NmridCgJuloq1wGTw8zDnzak8p0drnd2pS9EjtZirdiOymB+cymt61/Dkm0CKRkz3XXiv1ufkbkHO6zW/GU0G8iPLTmeHITr1BQ6jmG5yJKUWaiPHjzsH3GXo5NQgoXgYmU3nPGM/xn//yM= Received: from MN2PR11MB4063.namprd11.prod.outlook.com (10.255.180.22) by MN2PR11MB4208.namprd11.prod.outlook.com (52.135.36.80) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2538.20; Tue, 17 Dec 2019 16:15:43 +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; Tue, 17 Dec 2019 16:15:43 +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 v2 37/55] staging: wfx: simplify wfx_conf_tx() Thread-Topic: [PATCH v2 37/55] staging: wfx: simplify wfx_conf_tx() Thread-Index: AQHVtPUsL868vn81/0yJsYaLr+/fgQ== Date: Tue, 17 Dec 2019 16:15:19 +0000 Message-ID: <20191217161318.31402-38-Jerome.Pouiller@silabs.com> References: <20191217161318.31402-1-Jerome.Pouiller@silabs.com> In-Reply-To: <20191217161318.31402-1-Jerome.Pouiller@silabs.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: PR0P264CA0174.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1c::18) 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.24.0 x-originating-ip: [37.71.187.125] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: b68acbf3-b2e4-4097-e66c-08d7830c4f5e x-ms-traffictypediagnostic: MN2PR11MB4208: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:1728; x-forefront-prvs: 02543CD7CD x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(39850400004)(396003)(366004)(136003)(376002)(346002)(199004)(189003)(5660300002)(316002)(6506007)(85182001)(478600001)(71200400001)(2906002)(36756003)(186003)(26005)(81166006)(54906003)(1076003)(110136005)(66574012)(4326008)(8676002)(86362001)(6486002)(6666004)(52116002)(6512007)(64756008)(85202003)(66946007)(66476007)(66446008)(66556008)(8936002)(107886003)(2616005)(81156014); DIR:OUT; SFP:1101; SCL:1; SRVR:MN2PR11MB4208; 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: S4PmgccgZEOB0PqA9Pdx9A8/O6uGj4XSFTn18KP48fTtQwQ88ijVtBsMuZL/TPR08phNl3TY0nSfFAzdjRcea+TGLVi+212dV4fs93ZX5V89FdO6HeUWL6RkxKu6Ht/3Xatr2PLEfi7g0/eJQjbc4kRMtqYx0N+COT226q1DsiH91QHq1v35QeHMP2fjYhO6ODqus+AuayPfah6HAUOT6iAGcxGd2fNf5q+X6wifSb4aTSYcYJhnOKmv7nThETXaK3pJo20aT+4YIRDbRnPN4GC5FV46IYI9d8XDTopFX4A5V4kbEHWHUWTczSbrWDzRTbtENHEJFCKNNC49uzTP07DC5FgCzt1P25C7S+9e5WsiXiK4eMNr6GACiVM2sAXyGXPwCxQNL6ESFtWKeAfhPeGplKKb8rlK3PVU1QEAj3fw0bN2rfrbXdZptR9dtgKt Content-ID: <14529C3CBA36A446A39E9ACBB38B1839@namprd11.prod.outlook.com> MIME-Version: 1.0 X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: b68acbf3-b2e4-4097-e66c-08d7830c4f5e X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Dec 2019 16:15:19.2179 (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: TAmuATt9jRc35LbTL2UiYro1ZcY9RHa0uiBd+q3e93LDq//EllmE9UiVo21ocX5Ds+ZuJrW7yi2KhhD6dx3dNg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB4208 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jérôme Pouiller Error management of wfx_conf_tx() can be simplified. In add, the hardware command "hif_set_edca_queue_params" never returns any error. Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/sta.c | 44 ++++++++++++++------------------------- 1 file changed, 16 insertions(+), 28 deletions(-) diff --git a/drivers/staging/wfx/sta.c b/drivers/staging/wfx/sta.c index 42b0d01d85cc..045d3916ada8 100644 --- a/drivers/staging/wfx/sta.c +++ b/drivers/staging/wfx/sta.c @@ -370,39 +370,27 @@ int wfx_conf_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif, { struct wfx_dev *wdev = hw->priv; struct wfx_vif *wvif = (struct wfx_vif *) vif->drv_priv; - int ret = 0; struct hif_req_edca_queue_params *edca; - mutex_lock(&wdev->conf_mutex); - - if (queue < hw->queues) { - edca = &wvif->edca.params[queue]; - - wvif->edca.uapsd_enable[queue] = params->uapsd; - edca->aifsn = params->aifs; - edca->cw_min = params->cw_min; - edca->cw_max = params->cw_max; - edca->tx_op_limit = params->txop * TXOP_UNIT; - edca->allowed_medium_time = 0; - ret = hif_set_edca_queue_params(wvif, edca); - if (ret) { - ret = -EINVAL; - goto out; - } + WARN_ON(queue >= hw->queues); - if (wvif->vif->type == NL80211_IFTYPE_STATION) { - ret = wfx_set_uapsd_param(wvif, &wvif->edca); - if (!ret && wvif->setbssparams_done && - wvif->state == WFX_STATE_STA) - ret = wfx_update_pm(wvif); - } - } else { - ret = -EINVAL; + mutex_lock(&wdev->conf_mutex); + wvif->edca.uapsd_enable[queue] = params->uapsd; + edca = &wvif->edca.params[queue]; + edca->aifsn = params->aifs; + edca->cw_min = params->cw_min; + edca->cw_max = params->cw_max; + edca->tx_op_limit = params->txop * TXOP_UNIT; + edca->allowed_medium_time = 0; + hif_set_edca_queue_params(wvif, edca); + + if (wvif->vif->type == NL80211_IFTYPE_STATION) { + wfx_set_uapsd_param(wvif, &wvif->edca); + if (wvif->setbssparams_done && wvif->state == WFX_STATE_STA) + wfx_update_pm(wvif); } - -out: mutex_unlock(&wdev->conf_mutex); - return ret; + return 0; } int wfx_set_rts_threshold(struct ieee80211_hw *hw, u32 value)