From patchwork Mon Sep 7 10:15: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: 259371 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, MSGID_FROM_MTA_HEADER, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4B0C0C2BB84 for ; Mon, 7 Sep 2020 10:27:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F3E8A2067C for ; Mon, 7 Sep 2020 10:27:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=silabs.onmicrosoft.com header.i=@silabs.onmicrosoft.com header.b="jJ4P0e2x" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728913AbgIGK11 (ORCPT ); Mon, 7 Sep 2020 06:27:27 -0400 Received: from mail-eopbgr770081.outbound.protection.outlook.com ([40.107.77.81]:21675 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728704AbgIGKQR (ORCPT ); Mon, 7 Sep 2020 06:16:17 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aWwd23RDyRJp59GRletsDRKpqIZHnBfSv64T0wOV1ozQmMPHAcUuytfrC9eVjwn7SwH7qVvTvClaLMPY109kDLe3cWePoeN5crg9rtQwMoaQohP9Lp8f1wcXCYofULFa3bzGgHJJms+7WrMJ/U8xc84cG9T6o9oE+FHjqrEqqI/nLtt4SkDnPSTaK7sCzkZQMx9XyJQplxICB9k0NvvDo9HqaVw4VCzI+9LOhxNxsZVwm0cJvJCsnGYOpwnaavtlVXFrZiLpdHOX/kMApc7sx4zzBQIyy2ZbiTGq5hbEvjz4CnCN+xrdO5A0GOkCHwUXqMdzFviMzR9wzJ1oKtqh3g== 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=YqztAsbl4nfn21gkjpH4w2DK6L/ANObHzTWyuyTLncI=; b=AHRqEnAEKv/WwXstWLnQRTpzBhXByG8I/S5+duYuuLpBRT+8yEoNPUaMIrVyWWtaRkc+/vrN0QpuEzwRrAJ+XnE+cMSb5zHj3BiNmSyU+Y/wQXMhXIYXj0YhAWdpixXIPcWQNxInLOwRguMF9GbDUQbkRK4sMuHNN14BE3196BGCznChoEfhL3iVpYprp9baE1n6uQ1Ko8hsAf9BDRMfu6MyLslU6C+0vycpzQ2TFauSue2Cb4+1VJ+q+xLKtBtCyk8Oqoia60HTa5IyYkY2gcxBnsuazvdbWJF1y9t65FNqGDFXFP6meY7HBNYeDQY0do4h7fA41cH1wQY2/jIQjQ== 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=YqztAsbl4nfn21gkjpH4w2DK6L/ANObHzTWyuyTLncI=; b=jJ4P0e2xV/zEa1jfUGEqDKeGTjb6Xu6q9YrcYDz6G7fbD78mQyyRcH+ciJHrBVHy4aE2B6BtFIONOkKEovxck99nIgomRv2/qetkUDhq+ZgkJvB8kOU85qAP0KL+h0n2c/XmOi6ZSVx4ly3x/TPJnSgjtGapNCYAc6fzLzDWLHM= Authentication-Results: driverdev.osuosl.org; dkim=none (message not signed) header.d=none; driverdev.osuosl.org; dmarc=none action=none header.from=silabs.com; Received: from SN6PR11MB2718.namprd11.prod.outlook.com (2603:10b6:805:63::18) by SN6PR11MB2606.namprd11.prod.outlook.com (2603:10b6:805:55::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3348.17; Mon, 7 Sep 2020 10:16:02 +0000 Received: from SN6PR11MB2718.namprd11.prod.outlook.com ([fe80::85c9:1aa9:aeab:3fa6]) by SN6PR11MB2718.namprd11.prod.outlook.com ([fe80::85c9:1aa9:aeab:3fa6%4]) with mapi id 15.20.3348.019; Mon, 7 Sep 2020 10:16:02 +0000 From: Jerome Pouiller 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 11/31] staging: wfx: drop useless struct hif_ie_flags Date: Mon, 7 Sep 2020 12:15:01 +0200 Message-Id: <20200907101521.66082-12-Jerome.Pouiller@silabs.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200907101521.66082-1-Jerome.Pouiller@silabs.com> References: <20200907101521.66082-1-Jerome.Pouiller@silabs.com> X-ClientProxiedBy: PR0P264CA0109.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:19::25) To SN6PR11MB2718.namprd11.prod.outlook.com (2603:10b6:805:63::18) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from pc-42.silabs.com (37.71.187.125) by PR0P264CA0109.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:19::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3348.16 via Frontend Transport; Mon, 7 Sep 2020 10:16:01 +0000 X-Mailer: git-send-email 2.28.0 X-Originating-IP: [37.71.187.125] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 34189f51-5d9f-46df-5265-08d853170605 X-MS-TrafficTypeDiagnostic: SN6PR11MB2606: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:826; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YhddmrIK2W2h8B68srIws20AbwPBEtK9MxKIXzfUXH7AMqYAnyS5aBrkUM1OOk6/0aBiX0GmJDc6gfySI5IObaeblANpSz4gADSSMk7oCMxkEGWlOYSvgqdXY/0YYCXpc8wjhuzhyfAIarwcImVevz26zj4linFCLnctS+OMzIK/TiNOYs9AqcQjRdHcGZyJGG3mnWzZFWI3eTuayp8kPDJmyoQL8gbibpXVUVpO72s/9tsBjv1GOvqxSnmu8QUXYyiDuDVYRbDRVj9iTwXMhv1u1L9CTjBLKgOFUex2DmDj5nyvSnWIgI2ppE5P0FzJi1iAz9TyBNa5ahRfHZwZrg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SN6PR11MB2718.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(396003)(376002)(346002)(366004)(136003)(39850400004)(66946007)(4326008)(5660300002)(2616005)(66476007)(316002)(956004)(478600001)(54906003)(52116002)(2906002)(66556008)(1076003)(36756003)(8676002)(86362001)(6486002)(8936002)(7696005)(66574015)(83380400001)(26005)(107886003)(16526019)(186003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: autAfulsZJ9ISOsEo+aHpnbTL/w/wTOZSNGQWcU+2Gj9QGncF3Q24gTg6zTDIc3i2b2txcgDBmsOVFs/kBnQEcb9mpOr6Z+bxUBm7glGoLb+yJf7wIZS89aD4T0czIYjlvOA0hSmFZ2ybwhz9kd52ze2wYsL3OhXIDaKHeyUS4greeKjXixC3szEwkCtrv1y3SopeCdDcA00aLCPoxZggsTFo4zWkUev8uTA4kiDcaf3COE0A37EtrLzrIw5wyW4ypLTwY3ndXLP7CFs7PDWHfy8EOU3M+G3AM1kZg/VxKcLbCveGHolMsmZUdmvO3Y4l7xxY5f6vIpnF/77kbYLFkkse64fhsafiQZ5pXzNWhctN2T+WvIV/cO+aZ4YgJlnUS0/TYUSuN6OpAetfxvad1esJ9PQIbvIFSV1Cg/ayi3zRVzv0wDEn6t6S4kQSmxzV7wz9ob28YQCZlZX092m8UQopaKIgU/koOKF++fBre1iLxWqijVNS9zLw2sYbAheDVPAPevM0SIw6EXI+yvbQJyxoR7O5J8NVg3fi+2jNHVEf8D7VbWyjazgi5KjftqKOVDVSPMjC+ays3VaPdDnBSaDs1pwBd1VgdpkuOFawpn/hvOtWB3LX5hTD8/dD7ZPZ+CE67iN7cT7sKnln4oC4w== X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: 34189f51-5d9f-46df-5265-08d853170605 X-MS-Exchange-CrossTenant-AuthSource: SN6PR11MB2718.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Sep 2020 10:16:02.4989 (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: 0yEfgOwSOVwx3Li+CpLmsu/VrNGwtRe98MqKSLdS4T7gwLhxSqzAWBC559KmfEmyH0v8aPwvJsffyCnmSPIzAw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR11MB2606 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Jérôme Pouiller Struct hif_ie_flags has no reason to exist. Drop it and simplify access to struct hif_req_update_ie. Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/hif_api_cmd.h | 14 +++++--------- drivers/staging/wfx/hif_tx.c | 2 +- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/drivers/staging/wfx/hif_api_cmd.h b/drivers/staging/wfx/hif_api_cmd.h index 3da736dbf52c..b104abbc5b25 100644 --- a/drivers/staging/wfx/hif_api_cmd.h +++ b/drivers/staging/wfx/hif_api_cmd.h @@ -93,14 +93,6 @@ struct hif_cnf_write_mib { __le32 status; } __packed; -struct hif_ie_flags { - u8 beacon:1; - u8 probe_resp:1; - u8 probe_req:1; - u8 reserved1:5; - u8 reserved2; -} __packed; - struct hif_ie_tlv { u8 type; u8 length; @@ -108,7 +100,11 @@ struct hif_ie_tlv { } __packed; struct hif_req_update_ie { - struct hif_ie_flags ie_flags; + u8 beacon:1; + u8 probe_resp:1; + u8 probe_req:1; + u8 reserved1:5; + u8 reserved2; __le16 num_ies; struct hif_ie_tlv ie[]; } __packed; diff --git a/drivers/staging/wfx/hif_tx.c b/drivers/staging/wfx/hif_tx.c index 8736eb4d5f15..49523e70af6c 100644 --- a/drivers/staging/wfx/hif_tx.c +++ b/drivers/staging/wfx/hif_tx.c @@ -520,7 +520,7 @@ int hif_update_ie_beacon(struct wfx_vif *wvif, const u8 *ies, size_t ies_len) if (!hif) return -ENOMEM; - body->ie_flags.beacon = 1; + body->beacon = 1; body->num_ies = cpu_to_le16(1); memcpy(body->ie, ies, ies_len); wfx_fill_header(hif, wvif->id, HIF_REQ_ID_UPDATE_IE, buf_len);