From patchwork Tue May 5 12:37:45 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: 215718 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=-9.7 required=3.0 tests=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 79C24C47258 for ; Tue, 5 May 2020 12:39:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 59E5520735 for ; Tue, 5 May 2020 12:39:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=silabs.onmicrosoft.com header.i=@silabs.onmicrosoft.com header.b="nfLGHYT3" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729051AbgEEMi1 (ORCPT ); Tue, 5 May 2020 08:38:27 -0400 Received: from mail-eopbgr680041.outbound.protection.outlook.com ([40.107.68.41]:21169 "EHLO NAM04-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728820AbgEEMiY (ORCPT ); Tue, 5 May 2020 08:38:24 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ymd2QheM0awX1EQBPakXzDk2Cw+KPMZiuE9moh1rSyGy37l1MGiW5Zu/WLmiHbiKnjAE5YwdMNbp3RlLkLb0jEoFOuQM3GpUCoqbLKGM1ZHSbdoVoX55JkGX4TG4Ex/LsXrdcylf6ggLgc3ygo9h14VBpNy+5+8syd0Fppv0vheF1ituTzMeBp3FlaXLSoMqk4/bq718tswgVUvnI+Nu52036PxXCbNHlb3eNQPX2cbdRDN2L4QFTn8TU2UT9vMi1L937AE7JA4edZHDJWN8oTythDa+v+2X8BH8r1vvfPyYVMFhOawm9b8t//zWpCCsignQKQpe0jCeFvrHvLl2hA== 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=UCH8mmcJgGpVXMjhw1rPMvwlijTfdzjECeja2BjWE4s=; b=afdQrt2kD+3qBj/RebI46pOhDXFj30WQURxefyrScx01PHYTLCr7sxOdWfjgZhehCrmgqQQbMkzRQQcJR/Lpa7ltK+WLyn7ANX27EryCuz5pBy+wOXOSDPHmvNxm/YjsrrlniC1Qx1PcKgd8OLSFcFssTXixik8bVP7Pj1VG8DBGQiorjeRAloje/oVpjud2EyaLaZSnCRV9PSnmhkAOTHqZRmlA0/sPJ6GB2hr58aeoSa5FYONd/FcQgUKdysBsHHxlJ4LV6HmnzjhaL+HdS4BkHUIK+rzBgtXeaethsDH+9CeSTiePyHFkj20V6hMGjhhli6+C0SXa8khbXUh3DA== 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=UCH8mmcJgGpVXMjhw1rPMvwlijTfdzjECeja2BjWE4s=; b=nfLGHYT3tjNc8N7gSmrEQd4MNDfF8oh20p0rSfwdxSv8Imfonm+4Y8TMyxDSSnDlHaMaf8vIeHZ+6XRbRHlAv0Ssouv6CUoTBpP00NPkV8CfQmldG6c4evrPFrFo8H3u1ynuGTSM4ckCmspCeMM8XCa/XxZ/XrftDtuwWds7n2c= 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 MWHPR11MB1775.namprd11.prod.outlook.com (2603:10b6:300:10e::14) by MWHPR11MB1824.namprd11.prod.outlook.com (2603:10b6:300:110::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2958.19; Tue, 5 May 2020 12:38:18 +0000 Received: from MWHPR11MB1775.namprd11.prod.outlook.com ([fe80::81d5:b62b:3770:ffbe]) by MWHPR11MB1775.namprd11.prod.outlook.com ([fe80::81d5:b62b:3770:ffbe%10]) with mapi id 15.20.2958.030; Tue, 5 May 2020 12:38:18 +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=?= , =?utf-8?b?TWljaGHFgiBNaXJvc8WCYXc=?= Subject: [PATCH 03/15] staging: wfx: fix double free Date: Tue, 5 May 2020 14:37:45 +0200 Message-Id: <20200505123757.39506-4-Jerome.Pouiller@silabs.com> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200505123757.39506-1-Jerome.Pouiller@silabs.com> References: <20200505123757.39506-1-Jerome.Pouiller@silabs.com> X-ClientProxiedBy: PR3P189CA0022.EURP189.PROD.OUTLOOK.COM (2603:10a6:102:52::27) To MWHPR11MB1775.namprd11.prod.outlook.com (2603:10b6:300:10e::14) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from pc-42.home (2a01:e35:2435:66a0:1265:30ff:fefd:6e7f) by PR3P189CA0022.EURP189.PROD.OUTLOOK.COM (2603:10a6:102:52::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2958.20 via Frontend Transport; Tue, 5 May 2020 12:38:16 +0000 X-Mailer: git-send-email 2.26.1 X-Originating-IP: [2a01:e35:2435:66a0:1265:30ff:fefd:6e7f] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7a497b6d-5ca6-4459-e643-08d7f0f12ff1 X-MS-TrafficTypeDiagnostic: MWHPR11MB1824: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:949; X-Forefront-PRVS: 0394259C80 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JuFHG5gUtpG8MyTJnueniW1HpIIxzVVCn5pjwCIttjdz1b+qBRMU1Wv6A6CiUzSyh04zvZJpe54/ZBJBIxuO4LBnxGda4uT5JdMpH52WDxmmUKPCrs+ubeYE+wuTbBo6q45cNLcRKpSVnnakreq4RfbLFvFFF/iRT5UYGu4n83Dm39k6qW1G99TXw6coNAVmtWpDCGVqiM5NGhL9pEXx/4DV5vQn642d9aPKdSsGd3+F9bv7/8xwIESMFr857RetwWv3H5sA/m4qLkinkR5/9HmHn/RWaX02f1nAVa8OmrqLEYw56twmpC15yCAF1eLwb5zsYl0dKfNU582K3EsGaKWb3Lb0GU82/w8MU4HHd+2ICBZvemSxvm86NLnX0aoXYdx4rqmAMHmjdAkoc54XV00GywOqgOgLcAbfR6MonUZJJFz15s3cvFH7wjPEoNe+ZgNT0QpxRwKC0Q8Gs36CIpjsWmBXNFYz1WLmVCuqV2Bsr14v6Se8sAxRKvQCXKNeCx80pViLY9oRkb/1jviRuQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:MWHPR11MB1775.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(136003)(396003)(39850400004)(366004)(376002)(346002)(33430700001)(86362001)(6666004)(8886007)(1076003)(6512007)(6486002)(66574012)(4744005)(36756003)(5660300002)(2906002)(66476007)(6506007)(16526019)(186003)(52116002)(66946007)(66556008)(54906003)(2616005)(4326008)(8936002)(8676002)(316002)(33440700001)(478600001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: GI52Lil0C509Jevm0prHdGsZ+F0+OWARgP12+ow9Adx099jhVni7zZnHlL2+x2rVSRDjJBYoB6cTmKQ9v6148LBOrWYOSJT9Xcsj8kG546Pjybhu6PlPnqFnuA4DXO/1cHXxX9XNVR95o4S4d6jlekgqAbQK89Okafy6X9jAegc5bEO2wTX26JEIHQBasB58za3qdCZQ0bSzG46baolzHTP5RQUa6YXm6IxtBAf0OmvZP8ELJQbLRAa/pQ1KexysFtnkoBip8V9HlVBs7Bt1pr1RoFC/vlb6c+AFXStlfNqH3gxwQAcT71gn0t8IYMd443Vyk0rDkgg4bYaPmfR5sJmSDEC3wym31DzKrMjKq/tJQguApveRG7MP1uedy0KE/bgt9X0uPc5raR5y5ayT7iKfTz0BDXIUs/syd9lejFBZMGBPPjMEw2BQOrELKIbpp1PKDB2R0zENB3O8/2LnOWSw+YarmZfGTMB09xhUiwgFqvMHt1EcFVJLdCuEX7cN+8Df+oRebXV4bHt4RL92+l72vVwUdEhIO90Hi6ec1TDpdIxrDiM7OAvygRsSq9aFhEYnXJWwMBCwrh0TGqgpnOYp44MfK8SfovsUN6jtJRBYVkNyW7H7KPMIDSWGWdvT/jKRNXWHMKiXMaBaHFBga96RoTT2O0NGk5j5ovW9mYLIcRCpUVFMz3VhS9ApMYr/jfqWpKsc5cIoCgpeKWpEOWsAoHrtkkx540E3vv2S4zTJBKYesjrfgc4AG/BEi4i1ecpDRMJKsZgYdS3mxm6reBzoQ8Xi5FdbX2iTBTc7lufreI87SfhxUP782g/YOGaM1MortdIgtJXUy7NfocWUuVraJdW4p0G9Yt9VC+1hS3g= X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7a497b6d-5ca6-4459-e643-08d7f0f12ff1 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 May 2020 12:38:18.3409 (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: 4DK9wlolRBgBxKxkErqKoy6PhsuWiBEM8xefAIK2KeuPBSafbyr1RdHuDrkjB+r5oYhLXSzGz7vj2CNTBzkd5w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR11MB1824 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Jérôme Pouiller In case of error in wfx_probe(), wdev->hw is freed. Since an error occurred, wfx_free_common() is called, then wdev->hw is freed again. Cc: Michał Mirosław Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/main.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/staging/wfx/main.c b/drivers/staging/wfx/main.c index ba2e3a6b3549..5d0754b55429 100644 --- a/drivers/staging/wfx/main.c +++ b/drivers/staging/wfx/main.c @@ -469,7 +469,6 @@ int wfx_probe(struct wfx_dev *wdev) err2: ieee80211_unregister_hw(wdev->hw); - ieee80211_free_hw(wdev->hw); err1: wfx_bh_unregister(wdev); return err; From patchwork Tue May 5 12:37:47 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: 215719 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=-9.7 required=3.0 tests=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 72FE8C47259 for ; Tue, 5 May 2020 12:39:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 43BE020735 for ; Tue, 5 May 2020 12:39:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=silabs.onmicrosoft.com header.i=@silabs.onmicrosoft.com header.b="RAmZxdHS" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728948AbgEEMjr (ORCPT ); Tue, 5 May 2020 08:39:47 -0400 Received: from mail-eopbgr680041.outbound.protection.outlook.com ([40.107.68.41]:21169 "EHLO NAM04-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729066AbgEEMid (ORCPT ); Tue, 5 May 2020 08:38:33 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=a2+NwKMuAgDgcU6ihmSbBANq/3XshjVH4UEqu3IteijXAeYM1dxpeNe65pT7ksYQ485WyNE+lmwlqI4GRNebfqTtAPI9oUzq/+wQz1rBgiif0qtZbinYe6cdPI9A6jquuOZg2XF0Z0QITGKTSCsYnBND3OUPkLk4CfdvXiRgrdpXXd6qfz8YIcBAKN9o1CGY/7vW2Y97Klr3h9BtrF9EEIuS2Aiz9kEljdtLwBuHtolr+6cdgP5dCdo4CoRdfIk8i6kOePAXHgyYldMwrsc0zAR3Z8HO/eH9hdEbPiSUX2JSPF++EcCoZtR4/vqdOTg1sxeuQfNyyUgXPFU0kYEv1g== 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=fqh9i9zscCRg6KNYtU+dKQ57CReCKoYmlR6a8QVmV+s=; b=BjMMSLSPIQv/feKdF8IGDGBqAZTQjkYSRRS46d+JiqPULrR66LalgtDvuz7iUnF95iAO6S3vkjgJRo9rmCfKl5UNTwRNhy9VoklwyzW+7XFwB/euTKYlUj0/YzrCugc2OHi7spN1R9SSX8b3Jt8Dn3KlVh4UTcwWQsdk2M/JDEuOS0S/DRIzcWCOe5VnmjhvQj5AkCqoPaqZIryeKGnnpYib/oalGQhqTIXJiBZ00EOPRMjF2T5xechvgWRKgyAtg/RXh1i+1fZgsMQ7mLN5IkKFt2zxenlJfJfV7hzLGoMEA0BtyJfm/JkqieFZcxRgmiJz8uNhExK13cSosNvpBQ== 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=fqh9i9zscCRg6KNYtU+dKQ57CReCKoYmlR6a8QVmV+s=; b=RAmZxdHSrXRm1QR+FLSidpj+0dtc26UJtUoq1avZBEwU5OKlRH98k3KCqEvAs0LrZsAXL5ougHJHmEsVIxwYjSwExdFUTQg379aB4uugqq9sWEuaXUMdcN1C87NgE0FCcaq3Kge5eYubd4fvVgsyAXMlptQ81TCWy7XBLCod2U8= 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 MWHPR11MB1775.namprd11.prod.outlook.com (2603:10b6:300:10e::14) by MWHPR11MB1824.namprd11.prod.outlook.com (2603:10b6:300:110::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2958.19; Tue, 5 May 2020 12:38:22 +0000 Received: from MWHPR11MB1775.namprd11.prod.outlook.com ([fe80::81d5:b62b:3770:ffbe]) by MWHPR11MB1775.namprd11.prod.outlook.com ([fe80::81d5:b62b:3770:ffbe%10]) with mapi id 15.20.2958.030; Tue, 5 May 2020 12:38:22 +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 05/15] staging: wfx: repair external IRQ for SDIO Date: Tue, 5 May 2020 14:37:47 +0200 Message-Id: <20200505123757.39506-6-Jerome.Pouiller@silabs.com> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200505123757.39506-1-Jerome.Pouiller@silabs.com> References: <20200505123757.39506-1-Jerome.Pouiller@silabs.com> X-ClientProxiedBy: PR3P189CA0022.EURP189.PROD.OUTLOOK.COM (2603:10a6:102:52::27) To MWHPR11MB1775.namprd11.prod.outlook.com (2603:10b6:300:10e::14) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from pc-42.home (2a01:e35:2435:66a0:1265:30ff:fefd:6e7f) by PR3P189CA0022.EURP189.PROD.OUTLOOK.COM (2603:10a6:102:52::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2958.20 via Frontend Transport; Tue, 5 May 2020 12:38:20 +0000 X-Mailer: git-send-email 2.26.1 X-Originating-IP: [2a01:e35:2435:66a0:1265:30ff:fefd:6e7f] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6ce4bd42-1d5f-4e1e-2d7b-08d7f0f1328d X-MS-TrafficTypeDiagnostic: MWHPR11MB1824: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3383; X-Forefront-PRVS: 0394259C80 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tIKwI4+8dQG/RjhU/WGaiTMgdknsfezdW0QlKHvKwFCxJGlMpedBE6mW8H/WpjfRO+kFcITR4FZgIrzksKWkYOtSykJzABy6cARt2TFHjrX/My6xfQHqK+/7io7k0qCongr1h52a4k2WeFXu1HC+E49kidjtKdHgiq0PeynqBYk75H5K33IFy6OqMer5aiakPHEJF0Tf534whoairwZz7ObarXsbpHDNjoNKD6QjkjaYC/o7DbTnQ43X2NiXJ+vWPBjs834bplKKO8ibwRDfDVBmAbVTluAt8S0B9aRWQqEqm6QAWnknBLNDYCPIIIBf5V4Cwe9CbUlgTrayqYdGMIqOgLIHEdb0YR5hp/6FSoZyK5MovWpc7YH12vphClyPMY2rUNJIlcD9Y9AfOE7vjru409O0n7lvKAkaPGoICgvWnRwzodW9SH5bZo/87mbpijkOiMoFRxL2+fHFKVli4gtSegxdzv4zL3pcwA8g3qUEIWRnxjMJLXHFKRJjxF6QTQpvbtLZalkYV4IIucoCXQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:MWHPR11MB1775.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(136003)(396003)(39850400004)(366004)(376002)(346002)(33430700001)(86362001)(6666004)(107886003)(8886007)(1076003)(6512007)(6486002)(66574012)(36756003)(5660300002)(2906002)(66476007)(6506007)(16526019)(186003)(52116002)(66946007)(66556008)(54906003)(2616005)(4326008)(8936002)(8676002)(316002)(33440700001)(478600001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: 5XZVLeb4HQ28JcvB2MEwFK+/jsULNfsch3q999yW+PvWvqoJ1RlK1pP9xZEig8atieo9YUunnOzGyNhvjOj5PHBjONPeij2sLXeE3RM9UaNDQXhvu9VzVOthwnGz+CeB3hLJyAchzxdSapK2rdnYvhXheM7bqZchU95DTqNjXaLknVlEor2wn7DL+2zt8j768zTuu5+dBxJOr+VTUrCZGZSICIpWtyxrlKLN2CY8WhONG7uZJI8QAeHLZsYkTkt6MABeroAigabaufDiAINemQ+7dZqAyRiNxR4pm0OlIWnG3bspAqbqQYkX4XHDnQIG0Q5yVVis4PIUelO/cgKdWq+JisqCCK9G6vf+fb6X4aUYPWxm3tyRct1ivvQaONZC2AR9UTWlZTMEsNE50XSoKxZ7fiaewfts3FKBTQ/oI83fRFDHGJzZ+R8xM9fZR8GU7v74xiX5id1DDXFp0ETLkXhY9pVTMCjXQEKWO7sFi1yKbC9ptG1DfQQ/FnZmMDRU7HQOWdM6Aq26WVFo6QfiSykHWmsykic9zca7V7w1Rx1Dn3pn+nsuDN0yIltm4dPdt5ucko0yLOZQ3+NtJmj7Q+7TYZdXTAHdmN4TLV/m2PduxZ8M+VgcRp4OfaDuzBNxGG/eRVndHmI0XDwdnORdNXi1g0YZQ96IJxEsLSw+ROp/0pApUORo+brlnmgPU0H9ak6z7g+5dFtgZmqyO0csExQOAUh1pl601A0mJ/Dqni9tA8pF/kswydO76361jWf3g5h4A0ZNq9je361VPSo+7TY5h4Y4j7kdvVCC7Id3TvTp0yvwD1etQo18JtzCuQPvAy/0OCiz7KT20Tbnhwpy11Dl8bSl/wDg8Tmb06dFOf4= X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6ce4bd42-1d5f-4e1e-2d7b-08d7f0f1328d X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 May 2020 12:38:22.4591 (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: CkIEvWg8SDHZlHkx5YOspGtSd/9L2LmgpVsfE6rFWbnuSZpMXNM0vWndLAVWdKn8BxDIyJwxVC5SZNhH6ch/TA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR11MB1824 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Jérôme Pouiller When used over SDIO bus, device is able to use an external line to signal IRQs (also called Out-Of-Band IRQ). The current code have several problems: 1. The ISR cannot directly acknowledge IRQ since access to the bus is not atomic. This patch use a threaded IRQ to solve that issue. 2. On certain platforms, it is necessary to keep SDIO interruption enabled (with register SDIO_CCCR_IENx) (this part has inspired from the brcmfmac driver). Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/bus_sdio.c | 38 ++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/drivers/staging/wfx/bus_sdio.c b/drivers/staging/wfx/bus_sdio.c index 9ac87178270f..2f782120e438 100644 --- a/drivers/staging/wfx/bus_sdio.c +++ b/drivers/staging/wfx/bus_sdio.c @@ -6,10 +6,12 @@ * Copyright (c) 2010, ST-Ericsson */ #include +#include #include #include #include #include +#include #include "bus.h" #include "wfx.h" @@ -106,31 +108,41 @@ static irqreturn_t wfx_sdio_irq_handler_ext(int irq, void *priv) static int wfx_sdio_irq_subscribe(struct wfx_sdio_priv *bus) { + u32 flags; int ret; + u8 cccr; - if (bus->of_irq) { - ret = request_irq(bus->of_irq, wfx_sdio_irq_handler_ext, - IRQF_TRIGGER_RISING, "wfx", bus); - } else { + if (!bus->of_irq) { sdio_claim_host(bus->func); ret = sdio_claim_irq(bus->func, wfx_sdio_irq_handler); sdio_release_host(bus->func); + return ret; } - return ret; + + sdio_claim_host(bus->func); + cccr = sdio_f0_readb(bus->func, SDIO_CCCR_IENx, NULL); + cccr |= BIT(0); + cccr |= BIT(bus->func->num); + sdio_f0_writeb(bus->func, cccr, SDIO_CCCR_IENx, NULL); + sdio_release_host(bus->func); + flags = irq_get_trigger_type(bus->of_irq); + if (!flags) + flags = IRQF_TRIGGER_HIGH; + flags |= IRQF_ONESHOT; + return devm_request_threaded_irq(&bus->func->dev, bus->of_irq, NULL, + wfx_sdio_irq_handler_ext, flags, + "wfx", bus); } static int wfx_sdio_irq_unsubscribe(struct wfx_sdio_priv *bus) { int ret; - if (bus->of_irq) { - free_irq(bus->of_irq, bus); - ret = 0; - } else { - sdio_claim_host(bus->func); - ret = sdio_release_irq(bus->func); - sdio_release_host(bus->func); - } + if (bus->of_irq) + devm_free_irq(&bus->func->dev, bus->of_irq, bus); + sdio_claim_host(bus->func); + ret = sdio_release_irq(bus->func); + sdio_release_host(bus->func); return ret; } From patchwork Tue May 5 12:37:49 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: 215720 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=-9.7 required=3.0 tests=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 6B51BC47258 for ; Tue, 5 May 2020 12:39:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 44E6B20735 for ; Tue, 5 May 2020 12:39:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=silabs.onmicrosoft.com header.i=@silabs.onmicrosoft.com header.b="ihT53FlW" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729225AbgEEMjb (ORCPT ); Tue, 5 May 2020 08:39:31 -0400 Received: from mail-eopbgr680041.outbound.protection.outlook.com ([40.107.68.41]:21169 "EHLO NAM04-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729090AbgEEMik (ORCPT ); Tue, 5 May 2020 08:38:40 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SFnx+zMn+SGrfv8KLoswdNk2jkwF2sz8hogbxtRvfdKoR3b1TkLkyzFizeZoF2fqNGya1UbYHgQkIyiWMvodPGUydBemqDR0eRogDn3+Isj45pBICbkPVTOzBOaZRpTwnVG27JK3y3gEyyy6gqL7EEB5l7fJ8JSWcTOPOYvpDF3wWtcsmkF30uhoN7Aik1J7XlYhjKRwDLWWkbcBIMmUtt8ay0YlDBvHKitg7yXBuNL5lqzBVoQwfu/GxbryTmFDOO2dWpzNY4czfxApAfVMyDFVoXr4jzFQCrV6DIPaSc4YlrTd4R3Rkpz/xAMnkPWEteCx0/9ui3cx4kvpdOWkhg== 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=EcUyPk9HZS90+PsFFElskjoPjhRG9AXCGuuvtKpa0IQ=; b=B0C3rXTKnUcu1V3yVT5fpQO195zjvQyT/9fVXTw7XvdspHR+t4NhvtN4Ut3zzD3hgVU9Udsox1ZOcLxPlCtz8VhZA3aOWeZfPnNzHTAa3nWOOCQSVyD9F0rwLurSadSmEQcchvTPnDbaUSXgCP3Pc/zjxHbfpcGPDjj8zJSjvRlGsvVwCvPdR9L0guNnDHE+7QJX3KF9cuyB/+Ht5cdNNO2zsVEwQkSivP0PrQSfiZh5DyA7B1svbLYd6akXBEWTd3HzqNVwuYTxdBiRH7f9BAe0LIDjXVW60kAE1FvTY/O8iDkEjqjGr/0yxtTSusL3QqEgb3t0tJQkGcGb4iXABg== 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=EcUyPk9HZS90+PsFFElskjoPjhRG9AXCGuuvtKpa0IQ=; b=ihT53FlWnxFNCiI+W3+fRQnU2YKM6tkk7mBTb7a06HIy7TkNfoRmusIf16b2sWn76nPVG1174NLH5iCHKSwOBaKQJNPritcAPHE/Nfw9oSm1l79WNo0waEOK0cY8O+5HzzuwhMVRQTDcPz+bfit0XJKJAabx8gpW2GbtS7TiE4Y= 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 MWHPR11MB1775.namprd11.prod.outlook.com (2603:10b6:300:10e::14) by MWHPR11MB1824.namprd11.prod.outlook.com (2603:10b6:300:110::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2958.19; Tue, 5 May 2020 12:38:27 +0000 Received: from MWHPR11MB1775.namprd11.prod.outlook.com ([fe80::81d5:b62b:3770:ffbe]) by MWHPR11MB1775.namprd11.prod.outlook.com ([fe80::81d5:b62b:3770:ffbe%10]) with mapi id 15.20.2958.030; Tue, 5 May 2020 12:38:26 +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 07/15] staging: wfx: introduce a way to poll IRQ Date: Tue, 5 May 2020 14:37:49 +0200 Message-Id: <20200505123757.39506-8-Jerome.Pouiller@silabs.com> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200505123757.39506-1-Jerome.Pouiller@silabs.com> References: <20200505123757.39506-1-Jerome.Pouiller@silabs.com> X-ClientProxiedBy: PR3P189CA0022.EURP189.PROD.OUTLOOK.COM (2603:10a6:102:52::27) To MWHPR11MB1775.namprd11.prod.outlook.com (2603:10b6:300:10e::14) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from pc-42.home (2a01:e35:2435:66a0:1265:30ff:fefd:6e7f) by PR3P189CA0022.EURP189.PROD.OUTLOOK.COM (2603:10a6:102:52::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2958.20 via Frontend Transport; Tue, 5 May 2020 12:38:24 +0000 X-Mailer: git-send-email 2.26.1 X-Originating-IP: [2a01:e35:2435:66a0:1265:30ff:fefd:6e7f] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9fe488cf-928d-4865-c3cc-08d7f0f1350d X-MS-TrafficTypeDiagnostic: MWHPR11MB1824: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-Forefront-PRVS: 0394259C80 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: uwy6JxzVHlUPwRXcN0Q21anwH7G3IAIT7nNlFtWEYAaYMam1UxFY4flaD4UGMlMOnwS9ASDeDbkqVB4M12Ls6URu+I2pVc9NWptIvzbFQpap0U7bo07debwYc4EvGhjykmPsowKfEWu7iPuDhF4PoJ6lM9qRnU+Q9EewZnsaZJyUckAYHZHrpYLdSglUi4z9D7u8G6jl5qMABJ2KNCzsWW4On70DNJXSiGn/ZEK4cHOiEatKOpmlXpuCz+w5SOvQqmVy0r/c4ghTArsfHmHlrp0vCKoN4SjxzeaJtgRNHNzmpy5ImOiio6g0EpOrp4K8loJR23XoM7R7k1xZGaO9avPwRh7x5IG65sHfUqFoL6FzUst+hiudl95GUGkMLDcA+NmC8BhzOMKbRpmCGcFjvSzukeyyGVGUvLeJCR62bmYf+yHh//v/we02ob+RlgZ40yv83aftZ0BsKKeBSXE80DzIPhccBwDq8J6L8PT0YS6V8AAjOgR2ysKlGpCKmJ2IIIZSSc7B4cbj63TVDscFdNyovqFETnphsYVXqDRKdF1kiU+WmiQIQbCUQNC5q2PI X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:MWHPR11MB1775.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(136003)(396003)(39850400004)(366004)(376002)(346002)(33430700001)(86362001)(6666004)(107886003)(8886007)(1076003)(6512007)(6486002)(66574012)(36756003)(5660300002)(2906002)(66476007)(6506007)(16526019)(186003)(52116002)(66946007)(66556008)(54906003)(2616005)(4326008)(8936002)(8676002)(316002)(33440700001)(478600001)(43043002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: mxtROYWbXqQ0ZOPPXaz/1Irp5fqRWD92XRfdZBlYq+WEN+c9pMkZy7B9QSHgGbqxxXpu6i2zupA45Ovx9DRhl/FIKVeSOGV2fYvHypqtyiUi6B2W/mUdDyJxA3uadV3ey1VchVCNYet3zXMCMtwBI5jeKz6ItS3KebnyP17r9gh+Okq8xv6avk3aON394PEvv7clx11DrD9374znAKd18ESrFesE85PwNHdF0+1SD1g1cxN2M4DdRBTS+/dyTyBqQhLCf9sAQ88x3Q6KhRIj3fqYoykpPnbxLBEmUEBbj2VR65OzgF8hNoMOhOypqW0AJAKf95ne4WwVovc6LgyBcrubXEBeeJVkVi9AE2lVyY9Z1SX0q3UvheECxnrDcFa7BquvVRuvB7Od0p4hVo78QRQoOtncIaoaeb7iAYq0eWYuJwsCJSsG0A2rAaRAIUP8uPeBkecROfuR8ft2V+QpAEHD79e1TG3V8AtPN+FCikIhwvni+SJw4GfIA2k9GVQHyxE6U8szEes4gI2FRnzJ3fZl2JLecEk79x2m7DoXh0tswj3cZ8tIKbvK0lB6zbsHnH7KIYhhIXJOQzZTLiWroNhcLY4k+ZEM3wbNGieksN1rUl16BF8N73O1wrAmbCCRa2DXgQzuHH+0jXyEZfTwvZ4jQNKkeIxP34ZKvQCRpKxiyBxIBLH1XWcvlHZ1K/fnUU/5IQo63pjdKWNE0BqqvwQP7DVKWOEd0iEoxK2WCl8OvodfUNlo2I++8VR0ODrrqseJLhpaX2w1efwuhRLsXAywsWCgQfyZacNCxbDNqjRQg4yz6sD3wCCZ4ABK+ncA6/PXQW25CC6457rv0yQcvdeHIiqexu/esckTc+Qx0Ec= X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9fe488cf-928d-4865-c3cc-08d7f0f1350d X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 May 2020 12:38:26.8151 (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: jNtWZfCnAtlpm+fuKb4nj/N/wNN95vNtRMjd+utct2mZygeA7+4lg4ViwbgpOR4V2p8qheel0yR4LadbAGduug== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR11MB1824 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Jérôme Pouiller It is possible to check if an IRQ is ending by polling the control register. This function must used with care: if an IRQ fires while the host reads control register, the IRQ can be lost. However, it could be useful in some cases. Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/bh.c | 28 ++++++++++++++++++++++++++++ drivers/staging/wfx/bh.h | 1 + 2 files changed, 29 insertions(+) diff --git a/drivers/staging/wfx/bh.c b/drivers/staging/wfx/bh.c index ba7fa0a7cd9a..d3e7eed89c38 100644 --- a/drivers/staging/wfx/bh.c +++ b/drivers/staging/wfx/bh.c @@ -307,6 +307,34 @@ void wfx_bh_request_tx(struct wfx_dev *wdev) queue_work(system_highpri_wq, &wdev->hif.bh); } +/* + * If IRQ is not available, this function allow to manually poll the control + * register and simulate an IRQ ahen an event happened. + * + * Note that the device has a bug: If an IRQ raise while host read control + * register, the IRQ is lost. So, use this function carefully (only duing + * device initialisation). + */ +void wfx_bh_poll_irq(struct wfx_dev *wdev) +{ + ktime_t now, start; + u32 reg; + + start = ktime_get(); + for (;;) { + control_reg_read(wdev, ®); + now = ktime_get(); + if (reg & 0xFFF) + break; + if (ktime_after(now, ktime_add_ms(start, 1000))) { + dev_err(wdev->dev, "time out while polling control register\n"); + return; + } + udelay(200); + } + wfx_bh_request_rx(wdev); +} + void wfx_bh_register(struct wfx_dev *wdev) { INIT_WORK(&wdev->hif.bh, bh_work); diff --git a/drivers/staging/wfx/bh.h b/drivers/staging/wfx/bh.h index 93ca98424e0b..4b73437869e1 100644 --- a/drivers/staging/wfx/bh.h +++ b/drivers/staging/wfx/bh.h @@ -28,5 +28,6 @@ void wfx_bh_register(struct wfx_dev *wdev); void wfx_bh_unregister(struct wfx_dev *wdev); void wfx_bh_request_rx(struct wfx_dev *wdev); void wfx_bh_request_tx(struct wfx_dev *wdev); +void wfx_bh_poll_irq(struct wfx_dev *wdev); #endif /* WFX_BH_H */ From patchwork Tue May 5 12:37:50 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: 215724 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=-9.7 required=3.0 tests=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=ham 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 70D5BC47258 for ; Tue, 5 May 2020 12:38:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 39B5F20735 for ; Tue, 5 May 2020 12:38:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=silabs.onmicrosoft.com header.i=@silabs.onmicrosoft.com header.b="I+O6OaWr" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729145AbgEEMix (ORCPT ); Tue, 5 May 2020 08:38:53 -0400 Received: from mail-eopbgr680041.outbound.protection.outlook.com ([40.107.68.41]:21169 "EHLO NAM04-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729115AbgEEMit (ORCPT ); Tue, 5 May 2020 08:38:49 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=etgiWBhro+wph3OPL7GQU72jCaRqNP2xFwF9kYjCsYMozpmqYkK7wIMTu0fJbQZRGhRBgK4D4/xQbQniy5flt7dAZBTUX7IXaXY21xBKuaD1ntcz0fzMtNOJHIJ5NYkl1PmceyO7zUNvW2ibDqKWDbqpZyxe0y2vECpCwQ7XcTXqWzYC52DcyRh9ogWG0+LPrmoe/CkDvHNTDsOh/MOQ269mVDSopKQjlj7RfR5YTZSdCs4EZK7aZhWc0tnTbYkWxpswPA57tdh9TeeC4ur5C32R5xkx9610Vml6wHBapfo3g1C57Zp8tP70xr5ahWuHlm3/bRD0xhrM6qDyGP2j8g== 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=4GBNkwWw5Z5Rrd13zcIw/+v6k11pKV8yRE+roAUh8OA=; b=Ae4BSRe5ef/xTE2PSqmgLbBJMtaoh295GPcNB1LLj7oVYTQ4ygal3m9A2asGdI52sZKC091Q01hK7tvAivIPCCGJAAJGcBmliYri6xd7HR0P4YwIuA3yjIHipV0illGOSWrseoruWeMZf6jqcC+KS2/nQK9NAV4zOwwssBXU9vsgQ3b8AjdGSO0CvLDwfJTEXo5wU60lIo9mniNjrpx4NFst5RI4eTgr2k2e73Lyahfsd2P7cEdnyjc1IuzIodV75chKj6dSZEn0icIfGCskaJUQNi0YrfIP9/e8+h/xAVmI89/k38iE5pXEPrio9UxsnL51jYbb/Are84zgq4QhCw== 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=4GBNkwWw5Z5Rrd13zcIw/+v6k11pKV8yRE+roAUh8OA=; b=I+O6OaWrnkAm/3oqGhja7Y/op97u0V8pECLNeHPi4YudhpmeEXthq9pnnYrrs3jPFHbDzfesRXwDrciU/NmssQMXPnM/SMbtNddKQMsSf+4IGh5TyGTU3r4rfZyQ4pDTXyi2TgyJSKnQPRzG0QXg6tbvaMJSWSCTBvMflKfLfQY= 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 MWHPR11MB1775.namprd11.prod.outlook.com (2603:10b6:300:10e::14) by MWHPR11MB1824.namprd11.prod.outlook.com (2603:10b6:300:110::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2958.19; Tue, 5 May 2020 12:38:29 +0000 Received: from MWHPR11MB1775.namprd11.prod.outlook.com ([fe80::81d5:b62b:3770:ffbe]) by MWHPR11MB1775.namprd11.prod.outlook.com ([fe80::81d5:b62b:3770:ffbe%10]) with mapi id 15.20.2958.030; Tue, 5 May 2020 12:38:29 +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 08/15] staging: wfx: poll IRQ during init Date: Tue, 5 May 2020 14:37:50 +0200 Message-Id: <20200505123757.39506-9-Jerome.Pouiller@silabs.com> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200505123757.39506-1-Jerome.Pouiller@silabs.com> References: <20200505123757.39506-1-Jerome.Pouiller@silabs.com> X-ClientProxiedBy: PR3P189CA0022.EURP189.PROD.OUTLOOK.COM (2603:10a6:102:52::27) To MWHPR11MB1775.namprd11.prod.outlook.com (2603:10b6:300:10e::14) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from pc-42.home (2a01:e35:2435:66a0:1265:30ff:fefd:6e7f) by PR3P189CA0022.EURP189.PROD.OUTLOOK.COM (2603:10a6:102:52::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2958.20 via Frontend Transport; Tue, 5 May 2020 12:38:27 +0000 X-Mailer: git-send-email 2.26.1 X-Originating-IP: [2a01:e35:2435:66a0:1265:30ff:fefd:6e7f] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a3a155c8-c047-4d54-0166-08d7f0f1365d X-MS-TrafficTypeDiagnostic: MWHPR11MB1824: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-Forefront-PRVS: 0394259C80 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4iipnSn1CoMXDyCKQvRv1RP3NnjYX/8jJD6uq8Kx/fXW8dMY1YOAo8ZfTgMCz94x0t2W9lC3vrRmQkRLzL5iP5ZeVQCdHpOQVy5An4kItAb31W5I9BWTUKmlYRxK+5ikGjZ7t+dWO7Ft8EV5r54E7ou2TSj+haSbJ7pH6dvQDLsGeh4koDiMSfHNkPLVVI1r2h+L8u423MEZ6GLrRXBWFxUr0w0r8g71SfAbMLCfxvk8TRJQHF+2mMRL2eQwO6N5w3KMp7S0AvBBQa00RQA4nTJmp+gcWA5Vz7gp+fQXzlDc5meoK/xqO0wWBqxEkBJIQSYPRpoL5y4/Mx3VN4athgzaGIsBMTRLruOdhZEvJV+8qFFn8f3NV6/g17lj3ewymMbDMXnY5DiwKaVi4N1m8B+5epvaq9Y1AxWOXmvhPddm/E1QW223UEEBuAEjvF1YnKnp70KEbuWLS4apMllf5MpIExwJio8J6PM5JQsDJi1ULkTWHLOD74G5VdUOpWMjaNngv8kOQirU2/wzeE+4+w== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:MWHPR11MB1775.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(136003)(396003)(39850400004)(366004)(376002)(346002)(33430700001)(86362001)(6666004)(107886003)(8886007)(1076003)(6512007)(6486002)(66574012)(36756003)(5660300002)(2906002)(66476007)(6506007)(16526019)(186003)(52116002)(66946007)(66556008)(54906003)(2616005)(4326008)(8936002)(8676002)(316002)(33440700001)(478600001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: N2vCM2cnG5r18aMZEGxDh8x8bYwJFa7H2qmzjtqOz1AZCbTna9CG49kU/TMphkF98gQ8Fh9+ufSZpi7dQWtKWkOG1RIU7r87I+xKHLHGhHEKOxw3NIYN55DCsgDzmK7MK7Aqc+xjfKwis5vy1EL/onZImKSx9gDHHFLpqgqllLBfX1UwyazithzPza8jKUKR660C3h9dcFfU/bKRT6Y101O+c4qfHe/URbsT1ecvix4MizSmDxKRQPFzomjeSpRS01sGvu+6JVpLVwCYZbKvVZfy3qLuQCETvFUp5N+4Ln+Z4TIO0DgEZYnv9N4DKIBVClW7ceeleIpOWmY/3wuFSkmZFga4UUM9/GXnyYBgPgEdtmK5wYhbT3KmQsJcSG3/r5/PyangNCRt2J2bU5mdtTlhi8XtY347kOIAH2n/YY/QnB/V9h+rNQqAByrmiMtt5AztQLNdj8gMnIZ/uIgbDHoyG9Mi6xETj8urlM69bZeKd6ZdEfYxK4I0VM135K7qcYWqfKART8HSyoirxTfdRyydu2oEIqz2GYBG+1jRucLPvssKBF3w3Eo3y9u+wM4JZRTR3TxcksZu8MAZnLPmiT1ZZFt25u/clYIKmtBkl470YtLyP3UX3sYEl8GQ585HXo5LdNZG+Ymtz9Quah1T1vRGlYEVhl5GyTlMKCBE2q8Pwjgc0GqByzQtYSwL1LjvA+VjulLMIioiD2FLpMQjesReO4jwxdt46W4PkJ5X295gbG4T30K48MoxnMBZaJ6RhLlDyMXpWEH08Oeoglq/6xkG/yCyh2XT1zWzAPsL3TZQw2MRdzeGKPOH0NKDrfFumfZakf/ArR7EmuiRyGZtj+N7CjBE2gZtcs1Zn6wSyys= X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: a3a155c8-c047-4d54-0166-08d7f0f1365d X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 May 2020 12:38:29.0512 (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: eK8Bbfcd8Po+Aq1vEKEJPeVYrVtvnuA1ga3yx5rr+VtnAf/9Xg75tZpEWgIXuj8Bx9M2/Z9VlwKK/+3fHm4MAw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR11MB1824 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Jérôme Pouiller When the chip starts in SDIO mode, the external IRQ (aka Out-Of-Band IRQ) cannot be used before to configure it. Therefore, the first exchanges with the chip have to be done without the OOB IRQ. This patch allow to poll the data until the OOB IRQ is correctly setup. In order to keep the code simpler, this patch also poll data even if OOB IRQ is not used. Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/bh.c | 1 + drivers/staging/wfx/bus.h | 2 ++ drivers/staging/wfx/bus_sdio.c | 17 +++++++---------- drivers/staging/wfx/bus_spi.c | 16 +++++++++++++--- drivers/staging/wfx/hif_tx.c | 3 +++ drivers/staging/wfx/main.c | 28 ++++++++++++++++++++-------- drivers/staging/wfx/wfx.h | 1 + 7 files changed, 47 insertions(+), 21 deletions(-) diff --git a/drivers/staging/wfx/bh.c b/drivers/staging/wfx/bh.c index d3e7eed89c38..2572fbcf1a33 100644 --- a/drivers/staging/wfx/bh.c +++ b/drivers/staging/wfx/bh.c @@ -320,6 +320,7 @@ void wfx_bh_poll_irq(struct wfx_dev *wdev) ktime_t now, start; u32 reg; + WARN(!wdev->poll_irq, "unexpected IRQ polling can mask IRQ"); start = ktime_get(); for (;;) { control_reg_read(wdev, ®); diff --git a/drivers/staging/wfx/bus.h b/drivers/staging/wfx/bus.h index 62d6ecabe4cb..0370b6c59863 100644 --- a/drivers/staging/wfx/bus.h +++ b/drivers/staging/wfx/bus.h @@ -25,6 +25,8 @@ struct hwbus_ops { void *dst, size_t count); int (*copy_to_io)(void *bus_priv, unsigned int addr, const void *src, size_t count); + int (*irq_subscribe)(void *bus_priv); + int (*irq_unsubscribe)(void *bus_priv); void (*lock)(void *bus_priv); void (*unlock)(void *bus_priv); size_t (*align_size)(void *bus_priv, size_t size); diff --git a/drivers/staging/wfx/bus_sdio.c b/drivers/staging/wfx/bus_sdio.c index 2f782120e438..6afde2349289 100644 --- a/drivers/staging/wfx/bus_sdio.c +++ b/drivers/staging/wfx/bus_sdio.c @@ -106,8 +106,9 @@ static irqreturn_t wfx_sdio_irq_handler_ext(int irq, void *priv) return IRQ_HANDLED; } -static int wfx_sdio_irq_subscribe(struct wfx_sdio_priv *bus) +static int wfx_sdio_irq_subscribe(void *priv) { + struct wfx_sdio_priv *bus = priv; u32 flags; int ret; u8 cccr; @@ -134,8 +135,9 @@ static int wfx_sdio_irq_subscribe(struct wfx_sdio_priv *bus) "wfx", bus); } -static int wfx_sdio_irq_unsubscribe(struct wfx_sdio_priv *bus) +static int wfx_sdio_irq_unsubscribe(void *priv) { + struct wfx_sdio_priv *bus = priv; int ret; if (bus->of_irq) @@ -156,6 +158,8 @@ static size_t wfx_sdio_align_size(void *priv, size_t size) static const struct hwbus_ops wfx_sdio_hwbus_ops = { .copy_from_io = wfx_sdio_copy_from_io, .copy_to_io = wfx_sdio_copy_to_io, + .irq_subscribe = wfx_sdio_irq_subscribe, + .irq_unsubscribe = wfx_sdio_irq_unsubscribe, .lock = wfx_sdio_lock, .unlock = wfx_sdio_unlock, .align_size = wfx_sdio_align_size, @@ -212,18 +216,12 @@ static int wfx_sdio_probe(struct sdio_func *func, goto err1; } - ret = wfx_sdio_irq_subscribe(bus); - if (ret) - goto err1; - ret = wfx_probe(bus->core); if (ret) - goto err2; + goto err1; return 0; -err2: - wfx_sdio_irq_unsubscribe(bus); err1: sdio_claim_host(func); sdio_disable_func(func); @@ -237,7 +235,6 @@ static void wfx_sdio_remove(struct sdio_func *func) struct wfx_sdio_priv *bus = sdio_get_drvdata(func); wfx_release(bus->core); - wfx_sdio_irq_unsubscribe(bus); sdio_claim_host(func); sdio_disable_func(func); sdio_release_host(func); diff --git a/drivers/staging/wfx/bus_spi.c b/drivers/staging/wfx/bus_spi.c index 00613d046c3f..e8da61fb096b 100644 --- a/drivers/staging/wfx/bus_spi.c +++ b/drivers/staging/wfx/bus_spi.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include "bus.h" @@ -143,8 +144,9 @@ static irqreturn_t wfx_spi_irq_handler(int irq, void *priv) return IRQ_HANDLED; } -static int wfx_spi_irq_subscribe(struct wfx_spi_priv *bus) +static int wfx_spi_irq_subscribe(void *priv) { + struct wfx_spi_priv *bus = priv; u32 flags; flags = irq_get_trigger_type(bus->func->irq); @@ -156,6 +158,14 @@ static int wfx_spi_irq_subscribe(struct wfx_spi_priv *bus) "wfx", bus); } +static int wfx_spi_irq_unsubscribe(void *priv) +{ + struct wfx_spi_priv *bus = priv; + + devm_free_irq(&bus->func->dev, bus->func->irq, bus); + return 0; +} + static size_t wfx_spi_align_size(void *priv, size_t size) { // Most of SPI controllers avoid DMA if buffer size is not 32bit aligned @@ -165,6 +175,8 @@ static size_t wfx_spi_align_size(void *priv, size_t size) static const struct hwbus_ops wfx_spi_hwbus_ops = { .copy_from_io = wfx_spi_copy_from_io, .copy_to_io = wfx_spi_copy_to_io, + .irq_subscribe = wfx_spi_irq_subscribe, + .irq_unsubscribe = wfx_spi_irq_unsubscribe, .lock = wfx_spi_lock, .unlock = wfx_spi_unlock, .align_size = wfx_spi_align_size, @@ -216,8 +228,6 @@ static int wfx_spi_probe(struct spi_device *func) if (!bus->core) return -EIO; - wfx_spi_irq_subscribe(bus); - return wfx_probe(bus->core); } diff --git a/drivers/staging/wfx/hif_tx.c b/drivers/staging/wfx/hif_tx.c index e8f3c5f9ce7b..511ef874a6d9 100644 --- a/drivers/staging/wfx/hif_tx.c +++ b/drivers/staging/wfx/hif_tx.c @@ -82,6 +82,9 @@ int wfx_cmd_send(struct wfx_dev *wdev, struct hif_msg *request, void *reply, if (async) return 0; + if (wdev->poll_irq) + wfx_bh_poll_irq(wdev); + ret = wait_for_completion_timeout(&wdev->hif_cmd.done, 1 * HZ); if (!ret) { dev_err(wdev->dev, "chip is abnormally long to answer\n"); diff --git a/drivers/staging/wfx/main.c b/drivers/staging/wfx/main.c index 5d0754b55429..623a9fc31153 100644 --- a/drivers/staging/wfx/main.c +++ b/drivers/staging/wfx/main.c @@ -363,22 +363,24 @@ int wfx_probe(struct wfx_dev *wdev) // prevent bh() to touch it. gpio_saved = wdev->pdata.gpio_wakeup; wdev->pdata.gpio_wakeup = NULL; + wdev->poll_irq = true; wfx_bh_register(wdev); err = wfx_init_device(wdev); if (err) - goto err1; + goto err0; + wfx_bh_poll_irq(wdev); err = wait_for_completion_timeout(&wdev->firmware_ready, 1 * HZ); if (err <= 0) { if (err == 0) { - dev_err(wdev->dev, "timeout while waiting for startup indication. IRQ configuration error?\n"); + dev_err(wdev->dev, "timeout while waiting for startup indication\n"); err = -ETIMEDOUT; } else if (err == -ERESTARTSYS) { dev_info(wdev->dev, "probe interrupted by user\n"); } - goto err1; + goto err0; } // FIXME: fill wiphy::hw_version @@ -400,14 +402,14 @@ int wfx_probe(struct wfx_dev *wdev) "unsupported firmware API version (expect 1 while firmware returns %d)\n", wdev->hw_caps.api_version_major); err = -ENOTSUPP; - goto err1; + goto err0; } err = wfx_sl_init(wdev); if (err && wdev->hw_caps.capabilities.link_mode == SEC_LINK_ENFORCED) { dev_err(wdev->dev, "chip require secure_link, but can't negociate it\n"); - goto err1; + goto err0; } if (wdev->hw_caps.regul_sel_mode_info.region_sel_mode) { @@ -420,7 +422,16 @@ int wfx_probe(struct wfx_dev *wdev) wdev->pdata.file_pds); err = wfx_send_pdata_pds(wdev); if (err < 0) - goto err1; + goto err0; + + wdev->poll_irq = false; + err = wdev->hwbus_ops->irq_subscribe(wdev->hwbus_priv); + if (err) + goto err0; + + err = hif_use_multi_tx_conf(wdev, true); + if (err) + dev_err(wdev->dev, "misconfigured IRQ?\n"); wdev->pdata.gpio_wakeup = gpio_saved; if (wdev->pdata.gpio_wakeup) { @@ -435,8 +446,6 @@ int wfx_probe(struct wfx_dev *wdev) hif_set_operational_mode(wdev, HIF_OP_POWER_MODE_DOZE); } - hif_use_multi_tx_conf(wdev, true); - for (i = 0; i < ARRAY_SIZE(wdev->addresses); i++) { eth_zero_addr(wdev->addresses[i].addr); macaddr = of_get_mac_address(wdev->dev->of_node); @@ -470,6 +479,8 @@ int wfx_probe(struct wfx_dev *wdev) err2: ieee80211_unregister_hw(wdev->hw); err1: + wdev->hwbus_ops->irq_unsubscribe(wdev->hwbus_priv); +err0: wfx_bh_unregister(wdev); return err; } @@ -478,6 +489,7 @@ void wfx_release(struct wfx_dev *wdev) { ieee80211_unregister_hw(wdev->hw); hif_shutdown(wdev); + wdev->hwbus_ops->irq_unsubscribe(wdev->hwbus_priv); wfx_bh_unregister(wdev); wfx_sl_deinit(wdev); } diff --git a/drivers/staging/wfx/wfx.h b/drivers/staging/wfx/wfx.h index 09bbb5da4f06..4eb7762142fc 100644 --- a/drivers/staging/wfx/wfx.h +++ b/drivers/staging/wfx/wfx.h @@ -46,6 +46,7 @@ struct wfx_dev { struct wfx_hif hif; struct sl_context sl; struct delayed_work cooling_timeout_work; + bool poll_irq; bool chip_frozen; struct mutex conf_mutex; From patchwork Tue May 5 12:37:52 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: 215721 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=-9.7 required=3.0 tests=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 C9085C47258 for ; Tue, 5 May 2020 12:39:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A7CE32073B for ; Tue, 5 May 2020 12:39:28 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=silabs.onmicrosoft.com header.i=@silabs.onmicrosoft.com header.b="Hd0ClXJW" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729098AbgEEMin (ORCPT ); Tue, 5 May 2020 08:38:43 -0400 Received: from mail-eopbgr770049.outbound.protection.outlook.com ([40.107.77.49]:46720 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728737AbgEEMih (ORCPT ); Tue, 5 May 2020 08:38:37 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JdnwPAT4W8XAYwXsnhyjHkR95JYMY+fDJJtXRx7h3GguWEgaUC1hkhrXpGWTqALP4g0u0HeqvqrG9c38xCPCxFqi5F4OllsnKRo4sLtyJ8gZL3aFwCkMf6UQqthFmWMa9+sQ7VylyqYmaou4/VAFiQ0YZfCglVmUKZJ7nsoOPjC5KmPsXmb70lpDWrHw5MX/gyh2YRDveu9Mjxv7vJTqbb+pqkcOSdVygc1sVFACoVT4jQGic8oSg/P6AeZBa7c/r6sTRWf0wuFAql+3e7J4i8fCXsrPcTs0sICGQ7wXpbdkud5buU6WOdDNUQSsUcdE55tw/COpbmOlPceA8fK1FA== 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=/Voorz1nbEcUN0yj+akMAPNW372Wl9yW5ZwfS5LzEME=; b=J/JlVeuCjn+hCjzzaBVlzSvPSVDaNz8ZyrtUAPMEMPSA2/p2zeLf1rtkFGm07KcJZH6vw0hy+BwoLpB224sLWVMh0VGK1hmPF7xXn9PAQ+dD/R9aEtE2xTEyWzMwoA8wvprXOyGPm7wANParfP/dBLQlXFOricOUm7GsRAd1jtsiK7V3TNTb4AItOQqeokH10hD6YDdV0CTPmmDOm1N0osa8GEk90f+M5CpyTWyVx8kK8J4zy0lu7wK91wMf6UYXDOGya8+xSzItrKUyz1Z2GxWD8l+hAct1hW9KlaCW85XDJH/YnUILGUQ5FUea/Js82eD2WsPHnl4mSBqLq6WLiw== 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=/Voorz1nbEcUN0yj+akMAPNW372Wl9yW5ZwfS5LzEME=; b=Hd0ClXJWHMs5wE6wrXrMBHZjegcwm+yM7Hxy2sOBRhR8hxTMQ+k3tb2QGht5WaIBibOfa+ewUl08WDzFhuBYahVy3iQmXQQDF0F2KV+aK9afmxUTd5xVmR86/di84dLcx5kKFB3tAhg1Va83UWG5CJR85EmMBTVVCEE/mYfkfYc= 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 MWHPR11MB1775.namprd11.prod.outlook.com (2603:10b6:300:10e::14) by MWHPR11MB2046.namprd11.prod.outlook.com (2603:10b6:300:28::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2958.20; Tue, 5 May 2020 12:38:33 +0000 Received: from MWHPR11MB1775.namprd11.prod.outlook.com ([fe80::81d5:b62b:3770:ffbe]) by MWHPR11MB1775.namprd11.prod.outlook.com ([fe80::81d5:b62b:3770:ffbe%10]) with mapi id 15.20.2958.030; Tue, 5 May 2020 12:38:33 +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 10/15] staging: wfx: fix missing 'static' keyword Date: Tue, 5 May 2020 14:37:52 +0200 Message-Id: <20200505123757.39506-11-Jerome.Pouiller@silabs.com> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200505123757.39506-1-Jerome.Pouiller@silabs.com> References: <20200505123757.39506-1-Jerome.Pouiller@silabs.com> X-ClientProxiedBy: PR3P189CA0022.EURP189.PROD.OUTLOOK.COM (2603:10a6:102:52::27) To MWHPR11MB1775.namprd11.prod.outlook.com (2603:10b6:300:10e::14) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from pc-42.home (2a01:e35:2435:66a0:1265:30ff:fefd:6e7f) by PR3P189CA0022.EURP189.PROD.OUTLOOK.COM (2603:10a6:102:52::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2958.20 via Frontend Transport; Tue, 5 May 2020 12:38:31 +0000 X-Mailer: git-send-email 2.26.1 X-Originating-IP: [2a01:e35:2435:66a0:1265:30ff:fefd:6e7f] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8849a99d-67f0-4281-7b86-08d7f0f13916 X-MS-TrafficTypeDiagnostic: MWHPR11MB2046: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4502; X-Forefront-PRVS: 0394259C80 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 70PqeK4EsHL+SlsU4WoJhVKX/FBxvKwn6iDWOXhQPNH70IWZ3KvmtQP9cBeGth8O2uIodfuw5lWccx8EDgfUzbbqo3D0vUkjQ+n5VJNv2mAcYMJST31zyxAOaKlmBLPfo0FpxMDqfnV17oa82NM9SbsALka1yDAIEE2KaScx1/afPd48y03XX/IT8yoSQWLKBs4qCaeLCYnjDDGjFwFLwZIAtJ3duFHoy2/YzXM/ZaJoHs8LPOfwx7XKRLHERQ9E5f3hH710XCYykKDTz2uSYIuAzoZ6I4ZNEv1PqOf9FhKVYZDTmR9QV0cbYqsact7r1wn/pu26LnakUbFK9j6KENef2pUjm+dW+jGng1MHFMjo0qKQfOewh0x5vauWCyVEJm0ZN7kSl0b6gbX2MHjsKT6kwU2Kv1bWK2u7Ii7Xl1jxw+TwwZWzBV0TKuFwZa+ti20HDPdNpcrYqylnJM2ePnOTQslmNxD9Q62GN+y0scGa83DdmYcqRvu0EDdEjN4swo23j/68kY3ygAKe5+g2jQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:MWHPR11MB1775.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(396003)(366004)(346002)(39850400004)(136003)(376002)(33430700001)(2906002)(36756003)(4744005)(52116002)(86362001)(5660300002)(6486002)(1076003)(8676002)(66574012)(8936002)(6666004)(107886003)(2616005)(66476007)(66946007)(16526019)(186003)(66556008)(6512007)(8886007)(478600001)(4326008)(6506007)(33440700001)(54906003)(316002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: sU6cfI0eFWnk8zqxE/u4QMnoEekmVPNMORtRwm1oVC56YcK2Q+hGmvZpWXx8q7oBPscAqCFJ7U3siMlthdsJPgdZVDBMD0e/JqcHOk6U6w/PaUhI1v6b/jwBggmIDRKW7msdI5ffFGB4kQN3p89PBktQqmF2sxsEm7AswUearIXNqw014WVWb0fNx/8Pl0T21xZw5LA4u2xb/8jEXedHT75Rt4EsbUS2h/tv17qiIkJFb07O5L7dfj7ctHtlwd/sbyPunvVA5l/CUnVipjFelKTRreBeKgZmD0MWL/hqCHhQeK4pWwbcv8mqK2DKfACk9Zg6SIafB4NPHyXtSf3AI/8m5idu1fqL/WwTzhzyOM1+Ub1pbPF1Mi/usYHy1DDnuZ2IZuJJDGzHyk7icfiT5Pe7tlAC8o+e2QfvZsH7L2rUROGDa+mSJjp131u6bCg00p9HVW3qqWDADi4Z8b4WsKQtSC8k3GbD2QsHBgRtDbAkme7wGnst+YUFvTJw2NEoUNJxLe/USPPexTZITDw+uWo1mzb/NZRHcOZV9jj6YCtfihkDxwEGQjinE7zfWr7xsmVg6eSnmg2T6/s+mwhgnsYFzZw4WPsp3fpg42xG1K572Kf/Q65+etrqcd5VAh4GtqQlRYaSsomGbtyQqNi4YZH6fuTN9ce1lo8uTZCg/rAA5+1BSmejfjauowOrjKgZOOM63aMgtmTc1USkJUCQAwZBJP4qiDagmtVLBjR1hdetneSif9ZzwpgmygON5shk9ZeVeHcDRikm/5ImQPPLroRdonnAfGj8CSa9ojHXdjEqfEemVas+tWdczkxP7A12Lkqk8tSyMEFh8P1zQpKwN4IowGKqHU5pJjBEhwwssVQ= X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8849a99d-67f0-4281-7b86-08d7f0f13916 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 May 2020 12:38:33.5862 (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: amP72ULyb9m+W8In2qfyGc75bb7NOR+9je+LSOFOXnRSCmJRDlBwsEKHNhczWv0XdKdIV6mdM+8MmXusVRkldg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR11MB2046 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Jérôme Pouiller Sparse tool noticed that wfx_enable_beacon() is never used outside of sta.c. Therefore, it can be declared static. Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/sta.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/wfx/sta.c b/drivers/staging/wfx/sta.c index 74ec0b604085..3ad0b67a7dca 100644 --- a/drivers/staging/wfx/sta.c +++ b/drivers/staging/wfx/sta.c @@ -519,7 +519,7 @@ void wfx_leave_ibss(struct ieee80211_hw *hw, struct ieee80211_vif *vif) wfx_do_unjoin(wvif); } -void wfx_enable_beacon(struct wfx_vif *wvif, bool enable) +static void wfx_enable_beacon(struct wfx_vif *wvif, bool enable) { // Driver has Content After DTIM Beacon in queue. Driver is waiting for // a signal from the firmware. Since we are going to stop to send From patchwork Tue May 5 12:37:54 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: 215722 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=-9.7 required=3.0 tests=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 7C326C47247 for ; Tue, 5 May 2020 12:39:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 48A2420735 for ; Tue, 5 May 2020 12:39:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=silabs.onmicrosoft.com header.i=@silabs.onmicrosoft.com header.b="oxjcmiPX" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729135AbgEEMiw (ORCPT ); Tue, 5 May 2020 08:38:52 -0400 Received: from mail-eopbgr770049.outbound.protection.outlook.com ([40.107.77.49]:46720 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729108AbgEEMir (ORCPT ); Tue, 5 May 2020 08:38:47 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XGXccEr2GYUWmVvvoVRW8Pvvbi5bI0v/CasjSyscTQ7PkjUuMf6+ZIeEqqclFyI4Spp6mXYQbBTjeQuA+ne9K/qngFiJT7hmFAD4o+7oVlNkh35Oa2sQQgrDys2UuoNcXyJT8tHpPOrpD05bnkoPhktlQBzo3pxhucQY+60zEUdJmTyvIvqe+s4Fs0EwLRfTD43RdJrt0MQffRpZHng1Id9IjIabOJxLKx2zgYrtUvOR8WvvbyLHePy7vrnjOsKswhwQ/KihS6Wr+opdfhv4yuaO0Kwt9gw5o7Jtt00NNWko4a4mdvRs2Bb9kG7oWH+gUoR9QtTo5z9gaO6tj9jKUg== 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=OLBVgd1F2ASr9BwWToO4UitXyYYhquHN7v7yRbcgoVY=; b=lTYQy7yfgC5eKzZXPYzzZFgCL4vxIVWNHotU8xyGkOkuV/jJ4mE1vLu1QPPdOdI9bKqGhrP+OMi4D2BzsFriYtAipoJVDRZR8M0dbLK2FoyT3mMwQfXQCyz0McvSJmQIOgO+uiKx2YtN3oo8PpZJ8aYD64zwJ9cKisN1DAOkBBiGtiqbaqr9owxSCY9UgsUBw4IQ+iDPYBQAqQEZ+6lo3hrlUbIPiWvMPzJAPrVuEMV30YFftHf5pilqkbRJI48Biv1hQoHDBt9aLbBBuJFY4c7cmE4l5alMZ24tGn++mPNuc/dtqxuhaUoC73jJYLyMuvNqIuYhxN/80y5JWZidUA== 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=OLBVgd1F2ASr9BwWToO4UitXyYYhquHN7v7yRbcgoVY=; b=oxjcmiPXf1NSYt8gQAkxM3Qmwf/xR+aI+kxZAvpfitsbhjfwkHT/iVKp4CG5qdHGnFTkCgX4tByLKLD9V1y5pRUj1eJE9LlkxsJKzeRWe3zKgiff9Zbar6TiS6drMsiq4qdo4Thsl40ChWzb/X5cQT1h5V1+Tv13AFz4fCpYgA8= 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 MWHPR11MB1775.namprd11.prod.outlook.com (2603:10b6:300:10e::14) by MWHPR11MB2046.namprd11.prod.outlook.com (2603:10b6:300:28::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2958.20; Tue, 5 May 2020 12:38:37 +0000 Received: from MWHPR11MB1775.namprd11.prod.outlook.com ([fe80::81d5:b62b:3770:ffbe]) by MWHPR11MB1775.namprd11.prod.outlook.com ([fe80::81d5:b62b:3770:ffbe%10]) with mapi id 15.20.2958.030; Tue, 5 May 2020 12:38:37 +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 12/15] staging: wfx: remove useless header inclusions Date: Tue, 5 May 2020 14:37:54 +0200 Message-Id: <20200505123757.39506-13-Jerome.Pouiller@silabs.com> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200505123757.39506-1-Jerome.Pouiller@silabs.com> References: <20200505123757.39506-1-Jerome.Pouiller@silabs.com> X-ClientProxiedBy: PR3P189CA0022.EURP189.PROD.OUTLOOK.COM (2603:10a6:102:52::27) To MWHPR11MB1775.namprd11.prod.outlook.com (2603:10b6:300:10e::14) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from pc-42.home (2a01:e35:2435:66a0:1265:30ff:fefd:6e7f) by PR3P189CA0022.EURP189.PROD.OUTLOOK.COM (2603:10a6:102:52::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2958.20 via Frontend Transport; Tue, 5 May 2020 12:38:35 +0000 X-Mailer: git-send-email 2.26.1 X-Originating-IP: [2a01:e35:2435:66a0:1265:30ff:fefd:6e7f] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9ddefc9b-9325-4bb3-8f6e-08d7f0f13b9c X-MS-TrafficTypeDiagnostic: MWHPR11MB2046: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2582; X-Forefront-PRVS: 0394259C80 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PlfXKQsLQ0SBWMBghuDMqo+n1ZfXbVm5ck3QP7D83qkS0KuHUeRB/Uhp/K7ywYwPb8wmEnls4dGVVXrrWlFHMl68pYUmEQvudVOCCDBR8Ue8k+KorOZp20FzfLS646q/f5svTv2wtfY0UFiGh003ySqfZee0H06yWGqgnX8HwZZ2HoZQtSAZbiwhgNdToqneNOZh64A3+m0J8xexzaQ4VWcHekug/LUPH60Ls14o415+AEGismCzuNaHgx1qEJbonNfGBiPn2/sRTyGaqNoYccuEZNiYCBfJ9TBchJjd9NUTei44+kp2SMZzqENIit4Yw1osMYRk73Od60LiFVE2/GjgiS/S/Hlr2jzRAjAzTxeM3NyVUangeXfvlsrN7/j6kwBlBkC2/QJeFDbZpcfhGLTINFthgmavQ6lLB1MKqy+6ozJsdYwNZsv3OOZpHp6XiN5vSgxKADyzqbZLLwgLUBH5p9xKzcGu1JOZWMm9dZIooR+AVImkFKxKUtiEA4TmPzM4dbfrDLgdTs6whu3Vig== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:MWHPR11MB1775.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(396003)(366004)(346002)(39850400004)(136003)(376002)(33430700001)(2906002)(36756003)(52116002)(86362001)(5660300002)(6486002)(1076003)(8676002)(66574012)(8936002)(6666004)(107886003)(2616005)(66476007)(66946007)(16526019)(186003)(66556008)(6512007)(8886007)(478600001)(4326008)(6506007)(33440700001)(54906003)(316002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: tOjjhgb5rJdGvVAb1co2KPsBO18wygKZc7P4SRnINyT6OLqB7xromJ7PESgCk0sKsqc9BMH8rXsCQEhcxKQn1nr4KjOu0Yuytk58Y0APjSU5IODf3vOyEmp5rp9+/RLksupDTGMGEUFVp4LKXN9Kx+XTtayhs3ZXLV4UmK9fgENOJIKiwRtlntMzLnbcYb17rO/yN2VNzkWAs+i4kM5s7WUE6lNJUEbJrYYJueKg5PDLA5cj80toWl8L1AD2AWdm6UoQFczvO6b4+2gXx1k3JC4VQRk7c3NgnfOXgPZ/vXynppV9nUqVlWewHWdV8J0eUaaBBDN8s6mk7IBRjhJJGmSR0cpPR9c4logQYUy4DZNJWSigMh4BlZzoC+O5i8uZDXYuAClz3H4xfB6Gi55X28sruk60B7BSTJmXlzDldcDlMHxY3AjRi69xDWoQDa61KltdOxfTkMXr+meM17aHIwDtsxFFmgr6lATnpZIyqvZplVKiyLPDJQ1L/etHyo7s0dW0m3zfpi9dH1oRzXx39fe6RrBQxCN+eKAb0Wckz15/u2MyQk7mm31hWdeSxx9yBbwden6R7Yth10IuAx3DZcfi2PR42sA7xVEYjX4zmft8nG3XForAoUKeNbWpEStEWXtTJk+MZRuE47914w9e7KDI9mP5EQe7DbBuOieSVpcyI41/VNokfgt+3RGWeOaSL+bJfFhk8qaIyFYAq4+7T/Cb++e6UoFT47KJk1ism26oXRjD4jy0OVEaH0mkAgM01sSrNC3L7mvC8py9vWUoMfT/DLqHdtHkQBKbvCez9Cmwo5bCugIFitU5tPXDKNytHVeINExqW3cB+Lb3dEhv4G38ECj8EMySjq3H7Kdawoo= X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9ddefc9b-9325-4bb3-8f6e-08d7f0f13b9c X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 May 2020 12:38:37.6813 (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: j+QH6ZHEbulyd8VI1lsdKIl4U+9dDUI32emAieFiwR9UCUkbY2EgZfFHvP8Nd7pQ5XTatbRZpoqLtd48YB7/PA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR11MB2046 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Jérôme Pouiller In order to keep the compilation times reasonable, we try to only include the necessary headers (especially header included from other headers). This patch clean up unnecessary headers inclusions. Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/data_rx.h | 3 +-- drivers/staging/wfx/hif_tx.h | 3 +-- drivers/staging/wfx/hif_tx_mib.h | 2 -- drivers/staging/wfx/main.c | 1 + drivers/staging/wfx/main.h | 2 +- drivers/staging/wfx/queue.h | 2 -- drivers/staging/wfx/sta.h | 2 -- drivers/staging/wfx/wfx.h | 3 --- 8 files changed, 4 insertions(+), 14 deletions(-) diff --git a/drivers/staging/wfx/data_rx.h b/drivers/staging/wfx/data_rx.h index 61c28bfd2a37..125dbfc1f875 100644 --- a/drivers/staging/wfx/data_rx.h +++ b/drivers/staging/wfx/data_rx.h @@ -8,10 +8,9 @@ #ifndef WFX_DATA_RX_H #define WFX_DATA_RX_H -#include "hif_api_cmd.h" - struct wfx_vif; struct sk_buff; +struct hif_ind_rx; void wfx_rx_cb(struct wfx_vif *wvif, const struct hif_ind_rx *arg, struct sk_buff *skb); diff --git a/drivers/staging/wfx/hif_tx.h b/drivers/staging/wfx/hif_tx.h index 038ea54e2574..826851a7e950 100644 --- a/drivers/staging/wfx/hif_tx.h +++ b/drivers/staging/wfx/hif_tx.h @@ -10,12 +10,11 @@ #ifndef WFX_HIF_TX_H #define WFX_HIF_TX_H -#include "hif_api_cmd.h" - struct ieee80211_channel; struct ieee80211_bss_conf; struct ieee80211_tx_queue_params; struct cfg80211_scan_request; +struct hif_req_add_key; struct wfx_dev; struct wfx_vif; diff --git a/drivers/staging/wfx/hif_tx_mib.h b/drivers/staging/wfx/hif_tx_mib.h index b72770a4ba12..bce35eb7eaa0 100644 --- a/drivers/staging/wfx/hif_tx_mib.h +++ b/drivers/staging/wfx/hif_tx_mib.h @@ -9,8 +9,6 @@ #ifndef WFX_HIF_TX_MIB_H #define WFX_HIF_TX_MIB_H -#include "hif_api_mib.h" - struct wfx_vif; struct sk_buff; diff --git a/drivers/staging/wfx/main.c b/drivers/staging/wfx/main.c index 623a9fc31153..d3d86c8c92c8 100644 --- a/drivers/staging/wfx/main.c +++ b/drivers/staging/wfx/main.c @@ -28,6 +28,7 @@ #include "bh.h" #include "sta.h" #include "key.h" +#include "scan.h" #include "debug.h" #include "data_tx.h" #include "secure_link.h" diff --git a/drivers/staging/wfx/main.h b/drivers/staging/wfx/main.h index 9c9410072def..a0f37c8ce3df 100644 --- a/drivers/staging/wfx/main.h +++ b/drivers/staging/wfx/main.h @@ -13,10 +13,10 @@ #include #include -#include "bus.h" #include "hif_api_general.h" struct wfx_dev; +struct hwbus_ops; struct wfx_platform_data { /* Keyset and ".sec" extention will appended to this string */ diff --git a/drivers/staging/wfx/queue.h b/drivers/staging/wfx/queue.h index 1020dfde399b..0cbe5f4b06f2 100644 --- a/drivers/staging/wfx/queue.h +++ b/drivers/staging/wfx/queue.h @@ -11,8 +11,6 @@ #include #include -#include "hif_api_cmd.h" - struct wfx_dev; struct wfx_vif; diff --git a/drivers/staging/wfx/sta.h b/drivers/staging/wfx/sta.h index a0e025c18341..c84c3749ec4f 100644 --- a/drivers/staging/wfx/sta.h +++ b/drivers/staging/wfx/sta.h @@ -10,8 +10,6 @@ #include -#include "hif_api_cmd.h" - struct wfx_dev; struct wfx_vif; diff --git a/drivers/staging/wfx/wfx.h b/drivers/staging/wfx/wfx.h index 4eb7762142fc..09a24561f092 100644 --- a/drivers/staging/wfx/wfx.h +++ b/drivers/staging/wfx/wfx.h @@ -21,10 +21,7 @@ #include "main.h" #include "queue.h" #include "secure_link.h" -#include "sta.h" -#include "scan.h" #include "hif_tx.h" -#include "hif_api_general.h" #define USEC_PER_TXOP 32 // see struct ieee80211_tx_queue_params #define USEC_PER_TU 1024 From patchwork Tue May 5 12:37:56 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: 215723 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=-9.7 required=3.0 tests=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 63BB8C47247 for ; Tue, 5 May 2020 12:39:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 37CD720735 for ; Tue, 5 May 2020 12:39:16 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=silabs.onmicrosoft.com header.i=@silabs.onmicrosoft.com header.b="Bc+zhF+t" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729191AbgEEMjD (ORCPT ); Tue, 5 May 2020 08:39:03 -0400 Received: from mail-eopbgr770049.outbound.protection.outlook.com ([40.107.77.49]:46720 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729164AbgEEMi5 (ORCPT ); Tue, 5 May 2020 08:38:57 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZqQ1K3LbL/e2LX/uZ0zEpArzeIV93EsIBRUCwnN3RQGPJAGrYscryb/BpxNflDHhl1WyXcMcaiQDycgIrJKvfYzE6On2Ab1LlpmbQuVXQgufUts8W1HxYcz8aG88M0Gy0djMnpxYWMrCLG+sQmdOKtYkQmmC7oe2oPEO2boLISBfjwXZFdS0CoEi077qe2igOL370rcMoMmlV2o2TnZWDbj63+VVCmTCLLpnP1GKHb23Ky0oTII1MjEqTopQi6RFby5GwLDajaXf+/92fP/CXNLfxxGhIcH91A/B5/PG2HYyWd6OjhZ6dQSxkoQcCKeHXFDd9MrTJ5TVBsbSX1Aw5g== 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=q88NH/Z+Ghe/bbf7NcKlW2paRAvZh4tzX89eXQINv3k=; b=SB+645bXLcVzbJiOKG66csUigsyuf81YNo1Cs6+MO11lPaPG1Ryhq1Crw5huwsi8q78QY6aLNh1KXBC5d5GrspZWCKW9sG5pFA+4jMODQYIXEKA6cWFtv386EsIfAnOutadLs676kWLmhsvBDxke3yALSpqSQstc8fE7zrZX+Fnv3c/MTkKCpZ8VwT37VO+nvUrUAkhVobOshiHaC8ap1Z5d38wsRGm1eAw1s4YPL8Q8a5JIwnKFsv3eLBM9kXINxjAaNIGrjs0mcmyHz8SJG5S9qE80xLssHu59kJ1iIt7p8w4o1ysi4izbCUrUdlu0dj5I66q97QhN8Os96UIB4Q== 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=q88NH/Z+Ghe/bbf7NcKlW2paRAvZh4tzX89eXQINv3k=; b=Bc+zhF+tXyZ7Kknr21PHDyOu1b7RGyEyu3i44uaWqCusefje1KpuZHwKJ3KzPz9fZf4wDe7zDVtY4CyaajG4P8wfaIf0CAo7PazJzeF6c6/cqZN+PSlPxRF+6lpvTi1Ltsk36SkISe5+E1lNxM8dEYrHUo0QLHLY6fLty5CFMaA= 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 MWHPR11MB1775.namprd11.prod.outlook.com (2603:10b6:300:10e::14) by MWHPR11MB2046.namprd11.prod.outlook.com (2603:10b6:300:28::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2958.20; Tue, 5 May 2020 12:38:42 +0000 Received: from MWHPR11MB1775.namprd11.prod.outlook.com ([fe80::81d5:b62b:3770:ffbe]) by MWHPR11MB1775.namprd11.prod.outlook.com ([fe80::81d5:b62b:3770:ffbe%10]) with mapi id 15.20.2958.030; Tue, 5 May 2020 12:38:42 +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 14/15] staging: wfx: remove spaces after cast operator Date: Tue, 5 May 2020 14:37:56 +0200 Message-Id: <20200505123757.39506-15-Jerome.Pouiller@silabs.com> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200505123757.39506-1-Jerome.Pouiller@silabs.com> References: <20200505123757.39506-1-Jerome.Pouiller@silabs.com> X-ClientProxiedBy: PR3P189CA0022.EURP189.PROD.OUTLOOK.COM (2603:10a6:102:52::27) To MWHPR11MB1775.namprd11.prod.outlook.com (2603:10b6:300:10e::14) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from pc-42.home (2a01:e35:2435:66a0:1265:30ff:fefd:6e7f) by PR3P189CA0022.EURP189.PROD.OUTLOOK.COM (2603:10a6:102:52::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2958.20 via Frontend Transport; Tue, 5 May 2020 12:38:40 +0000 X-Mailer: git-send-email 2.26.1 X-Originating-IP: [2a01:e35:2435:66a0:1265:30ff:fefd:6e7f] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d97d77ea-cee9-4446-26c6-08d7f0f13e75 X-MS-TrafficTypeDiagnostic: MWHPR11MB2046: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:82; X-Forefront-PRVS: 0394259C80 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zj73ms6HDqQftp52Si40A33exkJetqINTYDMOal0gRQCkep+dPOFjFGwGxfIS3AMnwlsFoSy4hVRcVmWKqpyr8CZe/9MfzCm1e/0qXa40oap5t6IuIiStY82+4BhjAC3OBeEpo78Oq1t+Uq+VEfjpaGXvFheppDw1Nlo7WKAHLacsQoM1creXeiR7MZtJZTVqS+LCVlk4dy0lk7e6Cx74XMYaoU/sSbWjh3/gaLibhl2USNi85GXaTWoqBcPwiF6PkygRVGdj8+W6qh4+3yph/R76tmkGcN6+b7JXzqGBU87Xoh7O9MIKNGm6YZ8VKOC6ChhKO97cYHWt3Nv8IFJvSIXLpnrWexEr7If3kF4xgnzPdLmnW+DYY4d//nSLZdeZd5cH44MMaZHY+C0hKsZ+Xzj+HvChtmg9yx9YmI+nlisfH7CLTPHYTqHQlZNO26H9RhpHBf42ekGhSvMHmqiUL8AdkyATtbm1r2xrQucdAg+l26WrajslWUh1F1Q/Ohznf3iPgOMQIBqG9l9OocfAg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:MWHPR11MB1775.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(396003)(366004)(346002)(39850400004)(136003)(376002)(33430700001)(2906002)(36756003)(52116002)(86362001)(5660300002)(6486002)(1076003)(8676002)(66574012)(8936002)(6666004)(107886003)(2616005)(66476007)(66946007)(16526019)(186003)(66556008)(6512007)(8886007)(478600001)(4326008)(6506007)(33440700001)(54906003)(316002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: LK8YBSCFoy8TtPSPsINb7kkeWg12v+iN1/5TRhZVLcQ+TFuPMenM0dUWdRod9JCkrpCzT6rsCME/XbqNgkEhNzKJy4on8c5VLW9HNrQBxTUnDRpD/44HTlk9lEyB3PLE37U+459eod8BrEjlc8wUnrFr4jET2VHHf5kcJZxtr3LnUP1tQUwx2rBHUZH5wxLXe5H5w2ymGAVaaVXueCk8HEeiPv2pI48wUCp+jUwoJaf3VOsS2VEJks+gs4jHxfvzdrJDs0P7yPOueLMRqlJWbe80mncU7RV+Mx2o+z57A/YnOnOStDd9YPo57ewCt/09kBrZXBFtsgTYFhynhKH8g4+zhnNYc8dvb0z6Q05VQQZ82GmxsZ12fb2zurSspS/CJ9BHa2nvXyAb88Xehqh1jX3aQhgM4WusTVHNXwfazqfmsItkWPGHbuZQBWZTDAv1DsPIJELdsAfrAcWNzKATEP6FkmY3yuazuyadvhqMRiU6FLbny2R4yqtX+3V4UGTTjT7RyzphC43nS1WuiRyeEFwyEG2HD9+ki0ASf3vXuikQqcN8KVqhUc6D9LniNedLA8WRbqNqW/aLR4CPkyhxc0H3hx7lMi+FUewPwXcXv2fRjTH7PqY2HsaJ9o83Wc3PwBRKlWsWrw0Z+Oh3ZLMeC1x4fYoPXPQtBOjEzFbLhXt2u2hHDqWxyQbkz7ncniIYFWyZI+zjS+GC8IciFX34aXmfi6WPr/c8qs7Yctu54wtFY/6eJO/cAgvvNrg3vYMCreGakCcrXcq9T7bVvfzJLaq8erkW6/GmGiJCpK1VCggZFAaMQkJsNxosb55Jd7bU4+2joXInzjDE01B9tvHJB48u8NsGVAuhXg7ESwo2Hzs= X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: d97d77ea-cee9-4446-26c6-08d7f0f13e75 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 May 2020 12:38:42.6142 (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: EcQdWbMM3HseddVnwPA4JQdtI6sGZ+EVliz6RhwIgmNE8iGMzKCerDDuXkDqGzl6JcS+nVD+405/MRaBHlin8A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR11MB2046 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Jérôme Pouiller The kernel coding style expects no space after cast operator. This patch make the wfx driver compliant with this rule. Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/hif_rx.c | 2 +- drivers/staging/wfx/hif_tx.c | 4 ++-- drivers/staging/wfx/hwio.c | 4 ++-- drivers/staging/wfx/key.c | 2 +- drivers/staging/wfx/main.c | 2 +- drivers/staging/wfx/sta.c | 23 +++++++++++------------ 6 files changed, 18 insertions(+), 19 deletions(-) diff --git a/drivers/staging/wfx/hif_rx.c b/drivers/staging/wfx/hif_rx.c index b786714a8755..ac4ec4f30496 100644 --- a/drivers/staging/wfx/hif_rx.c +++ b/drivers/staging/wfx/hif_rx.c @@ -263,7 +263,7 @@ static int hif_generic_indication(struct wfx_dev *wdev, return 0; case HIF_GENERIC_INDICATION_TYPE_STRING: dev_info(wdev->dev, "firmware says: %s\n", - (char *) body->indication_data.raw_data); + (char *)body->indication_data.raw_data); return 0; case HIF_GENERIC_INDICATION_TYPE_RX_STATS: mutex_lock(&wdev->rx_stats_lock); diff --git a/drivers/staging/wfx/hif_tx.c b/drivers/staging/wfx/hif_tx.c index 96f13d9c8c98..b083fcace303 100644 --- a/drivers/staging/wfx/hif_tx.c +++ b/drivers/staging/wfx/hif_tx.c @@ -106,7 +106,7 @@ int wfx_cmd_send(struct wfx_dev *wdev, struct hif_msg *request, if (ret && (cmd == HIF_REQ_ID_READ_MIB || cmd == HIF_REQ_ID_WRITE_MIB)) { - mib_name = get_mib_name(((u16 *) request)[2]); + mib_name = get_mib_name(((u16 *)request)[2]); mib_sep = "/"; } if (ret < 0) @@ -470,7 +470,7 @@ int hif_map_link(struct wfx_vif *wvif, u8 *mac_addr, int flags, int sta_id) if (mac_addr) ether_addr_copy(body->mac_addr, mac_addr); - body->map_link_flags = *(struct hif_map_link_flags *) &flags; + body->map_link_flags = *(struct hif_map_link_flags *)&flags; body->peer_sta_id = sta_id; wfx_fill_header(hif, wvif->id, HIF_REQ_ID_MAP_LINK, sizeof(*body)); ret = wfx_cmd_send(wvif->wdev, hif, NULL, 0, false); diff --git a/drivers/staging/wfx/hwio.c b/drivers/staging/wfx/hwio.c index 051d4b233b47..d878cb3e84fc 100644 --- a/drivers/staging/wfx/hwio.c +++ b/drivers/staging/wfx/hwio.c @@ -233,7 +233,7 @@ int wfx_data_read(struct wfx_dev *wdev, void *buf, size_t len) { int ret; - WARN((long) buf & 3, "%s: unaligned buffer", __func__); + WARN((long)buf & 3, "%s: unaligned buffer", __func__); wdev->hwbus_ops->lock(wdev->hwbus_priv); ret = wdev->hwbus_ops->copy_from_io(wdev->hwbus_priv, WFX_REG_IN_OUT_QUEUE, buf, len); @@ -249,7 +249,7 @@ int wfx_data_write(struct wfx_dev *wdev, const void *buf, size_t len) { int ret; - WARN((long) buf & 3, "%s: unaligned buffer", __func__); + WARN((long)buf & 3, "%s: unaligned buffer", __func__); wdev->hwbus_ops->lock(wdev->hwbus_priv); ret = wdev->hwbus_ops->copy_to_io(wdev->hwbus_priv, WFX_REG_IN_OUT_QUEUE, buf, len); diff --git a/drivers/staging/wfx/key.c b/drivers/staging/wfx/key.c index ceb57cbdfefd..5ee2ffc5f935 100644 --- a/drivers/staging/wfx/key.c +++ b/drivers/staging/wfx/key.c @@ -228,7 +228,7 @@ int wfx_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, struct ieee80211_key_conf *key) { int ret = -EOPNOTSUPP; - struct wfx_vif *wvif = (struct wfx_vif *) vif->drv_priv; + struct wfx_vif *wvif = (struct wfx_vif *)vif->drv_priv; mutex_lock(&wvif->wdev->conf_mutex); if (cmd == SET_KEY) diff --git a/drivers/staging/wfx/main.c b/drivers/staging/wfx/main.c index de41f1671433..18c96b82c66e 100644 --- a/drivers/staging/wfx/main.c +++ b/drivers/staging/wfx/main.c @@ -390,7 +390,7 @@ int wfx_probe(struct wfx_dev *wdev) wdev->hw_caps.firmware_build, wdev->hw_caps.firmware_label, wdev->hw_caps.api_version_major, wdev->hw_caps.api_version_minor, - wdev->keyset, *((u32 *) &wdev->hw_caps.capabilities)); + wdev->keyset, *((u32 *)&wdev->hw_caps.capabilities)); snprintf(wdev->hw->wiphy->fw_version, sizeof(wdev->hw->wiphy->fw_version), "%d.%d.%d", diff --git a/drivers/staging/wfx/sta.c b/drivers/staging/wfx/sta.c index 999e0f0e19af..1a876a0faaf5 100644 --- a/drivers/staging/wfx/sta.c +++ b/drivers/staging/wfx/sta.c @@ -251,7 +251,7 @@ int wfx_conf_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif, u16 queue, const struct ieee80211_tx_queue_params *params) { struct wfx_dev *wdev = hw->priv; - struct wfx_vif *wvif = (struct wfx_vif *) vif->drv_priv; + struct wfx_vif *wvif = (struct wfx_vif *)vif->drv_priv; int old_uapsd = wvif->uapsd_mask; WARN_ON(queue >= hw->queues); @@ -345,8 +345,7 @@ static void wfx_set_mfp(struct wfx_vif *wvif, rcu_read_lock(); if (bss) - ptr = (const u16 *) ieee80211_bss_get_ie(bss, - WLAN_EID_RSN); + ptr = (const u16 *)ieee80211_bss_get_ie(bss, WLAN_EID_RSN); if (ptr) { ptr += pairwise_cipher_suite_count_offset; @@ -411,8 +410,8 @@ static void wfx_do_join(struct wfx_vif *wvif) int wfx_sta_add(struct ieee80211_hw *hw, struct ieee80211_vif *vif, struct ieee80211_sta *sta) { - struct wfx_vif *wvif = (struct wfx_vif *) vif->drv_priv; - struct wfx_sta_priv *sta_priv = (struct wfx_sta_priv *) &sta->drv_priv; + struct wfx_vif *wvif = (struct wfx_vif *)vif->drv_priv; + struct wfx_sta_priv *sta_priv = (struct wfx_sta_priv *)&sta->drv_priv; spin_lock_init(&sta_priv->lock); sta_priv->vif_id = wvif->id; @@ -432,8 +431,8 @@ int wfx_sta_add(struct ieee80211_hw *hw, struct ieee80211_vif *vif, int wfx_sta_remove(struct ieee80211_hw *hw, struct ieee80211_vif *vif, struct ieee80211_sta *sta) { - struct wfx_vif *wvif = (struct wfx_vif *) vif->drv_priv; - struct wfx_sta_priv *sta_priv = (struct wfx_sta_priv *) &sta->drv_priv; + struct wfx_vif *wvif = (struct wfx_vif *)vif->drv_priv; + struct wfx_sta_priv *sta_priv = (struct wfx_sta_priv *)&sta->drv_priv; int i; for (i = 0; i < ARRAY_SIZE(sta_priv->buffered); i++) @@ -534,7 +533,7 @@ void wfx_bss_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif, struct ieee80211_bss_conf *info, u32 changed) { struct wfx_dev *wdev = hw->priv; - struct wfx_vif *wvif = (struct wfx_vif *) vif->drv_priv; + struct wfx_vif *wvif = (struct wfx_vif *)vif->drv_priv; int i; mutex_lock(&wdev->conf_mutex); @@ -703,7 +702,7 @@ void wfx_change_chanctx(struct ieee80211_hw *hw, int wfx_assign_vif_chanctx(struct ieee80211_hw *hw, struct ieee80211_vif *vif, struct ieee80211_chanctx_conf *conf) { - struct wfx_vif *wvif = (struct wfx_vif *) vif->drv_priv; + struct wfx_vif *wvif = (struct wfx_vif *)vif->drv_priv; struct ieee80211_channel *ch = conf->def.chan; WARN(wvif->channel, "channel overwrite"); @@ -716,7 +715,7 @@ void wfx_unassign_vif_chanctx(struct ieee80211_hw *hw, struct ieee80211_vif *vif, struct ieee80211_chanctx_conf *conf) { - struct wfx_vif *wvif = (struct wfx_vif *) vif->drv_priv; + struct wfx_vif *wvif = (struct wfx_vif *)vif->drv_priv; struct ieee80211_channel *ch = conf->def.chan; WARN(wvif->channel != ch, "channel mismatch"); @@ -732,7 +731,7 @@ int wfx_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif) { int i, ret = 0; struct wfx_dev *wdev = hw->priv; - struct wfx_vif *wvif = (struct wfx_vif *) vif->drv_priv; + struct wfx_vif *wvif = (struct wfx_vif *)vif->drv_priv; vif->driver_flags |= IEEE80211_VIF_BEACON_FILTER | IEEE80211_VIF_SUPPORTS_UAPSD | @@ -799,7 +798,7 @@ int wfx_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif) void wfx_remove_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif) { struct wfx_dev *wdev = hw->priv; - struct wfx_vif *wvif = (struct wfx_vif *) vif->drv_priv; + struct wfx_vif *wvif = (struct wfx_vif *)vif->drv_priv; wait_for_completion_timeout(&wvif->set_pm_mode_complete, msecs_to_jiffies(300));