From patchwork Wed Oct 7 10:19:38 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: 268502 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.8 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, 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 B2C77C41604 for ; Wed, 7 Oct 2020 10:20:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5105520870 for ; Wed, 7 Oct 2020 10:20:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=silabs.onmicrosoft.com header.i=@silabs.onmicrosoft.com header.b="JIjqI6/+" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728029AbgJGKUV (ORCPT ); Wed, 7 Oct 2020 06:20:21 -0400 Received: from mail-bn8nam12on2066.outbound.protection.outlook.com ([40.107.237.66]:19424 "EHLO NAM12-BN8-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727623AbgJGKUR (ORCPT ); Wed, 7 Oct 2020 06:20:17 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TK3hzUFMV6SS+JA8ar4yKYOln8KnVu9TNiSTLEZqBYi7mVmjMkhv0ydGKiGnfYAsPhkJyfk0+opbh+nWW7mph2tA5ymuwBUAAy0sv8M2q69KLaOe2jiRAlHHWTl4RtSSmeGZA38B+LZ0itffdVOC5y+9SyDUQSikbW16WbRZRCfUGUGV4Btv/IJgpBgFQfMULfV5UoqVQcHVkPQao8LpymBNgYVQ6HhB5WgFv4j7dlX1ovpzNmXburoOJ3a+94Dxyqe4ypHLVZ/yh8l+rBIJI6oovubuuagUpNBuZ5AWCgM/rpTGlwXc45rAEgKDKt5tcs4mhiEypt/j0aw/fgaGeQ== 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=Rh8rU3iw4pr91IwT9End/AcLY2Vp/Cx2fpEvjXsBWfM=; b=BfbqJsgZSAxOpYvwjI6HF8Qq2x2J2OBZRKYHMhlRxHwt7CRTrNZAQSYw6BhOYWrEsB06E6M28ZnQl1ge+c6K8Gm5W1oFv9EhFDZ1MiObtfKCNzijlf9xDXGkoet2OCl0qS4nyJF8xht67XDg7+6JDBXD+L5HCO1DEXKlZh9QnsPIvuV1xLWjnvuxIpwIIBMGuZH2hGL7yf0pYXVk0616RvjJM0yHizoQC1cSIDftTzAfNDJewfkwuUPekFl+4Zh/xXzQIhIuWinyNC68FUO78BKQy/VblWk21Wx1qSJ0as6v07SAff+sFQ/2ggYlmAJu4n8QjCYPHSses5i3S1Bqhg== 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=Rh8rU3iw4pr91IwT9End/AcLY2Vp/Cx2fpEvjXsBWfM=; b=JIjqI6/+ycsNz0QnofDP4qt8M6mJEQ/LZvHHeDQ4jW8cI2A3JnkgN+gx076of8dyLcbKL6tezlCtYHvi4SdEAyLYEo321L0rAlM9000AcjH+FyD4ku1DHhi9oN+2rHJO1pGl1iyTBfDRsK1xYIwO1I0cuSPrx62MtlFKNSyKeW8= 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 SA0PR11MB4670.namprd11.prod.outlook.com (2603:10b6:806:9a::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3455.23; Wed, 7 Oct 2020 10:20:06 +0000 Received: from SN6PR11MB2718.namprd11.prod.outlook.com ([fe80::4f5:fbe5:44a7:cb8a]) by SN6PR11MB2718.namprd11.prod.outlook.com ([fe80::4f5:fbe5:44a7:cb8a%5]) with mapi id 15.20.3433.044; Wed, 7 Oct 2020 10:20:06 +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 2/7] staging: wfx: remove remaining code of 'secure link' feature Date: Wed, 7 Oct 2020 12:19:38 +0200 Message-Id: <20201007101943.749898-3-Jerome.Pouiller@silabs.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201007101943.749898-1-Jerome.Pouiller@silabs.com> References: <20201007101943.749898-1-Jerome.Pouiller@silabs.com> X-Originating-IP: [82.67.86.106] X-ClientProxiedBy: PR0P264CA0111.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:19::27) To SN6PR11MB2718.namprd11.prod.outlook.com (2603:10b6:805:63::18) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from pc-42.home (82.67.86.106) by PR0P264CA0111.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:19::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3455.23 via Frontend Transport; Wed, 7 Oct 2020 10:20:05 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f240aa9c-03dd-4d4c-4894-08d86aaa8fd1 X-MS-TrafficTypeDiagnostic: SA0PR11MB4670: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4125; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DhWTB4XO3ph8XFWRLCJhMEdCRRA/3SvxfqypFq8JmUFhsx4Y5p3aiEqI1qz/uCRa/I/ZbhTAxjOpF4L8x4oONgZrvqn/ANJHAs7uH9CEycHa0DPT7zwSiY5xkoy/t1JMi3ldK35zkSoNbSeMTiG3WezA+KusLqKzOTccC9iFI409mGHbK4MmtQbD3dTHt8uixnuVaFSUUSyE0U+EtoBaeh1BJrLkT1LjZ6buDpKutJd5IQ+IlLjB2qEG6FpEKcOaWYiSu/IwJviohyrUDTw4qTioBiEQtNZCNHSNNbcTmFXpFbEt5bUprx2zVoE0DSBWBvL1L4RcrPaoHPywplCNNQ== 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:(39850400004)(346002)(136003)(376002)(366004)(396003)(66556008)(66476007)(6486002)(66946007)(316002)(54906003)(4326008)(478600001)(2906002)(1076003)(5660300002)(186003)(8936002)(8676002)(16526019)(52116002)(83380400001)(26005)(6506007)(2616005)(86362001)(956004)(107886003)(8886007)(36756003)(6666004)(6512007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: caHlJ/MCCGmz4QR2rZEyRJq6TRzrV6lJiAotWgJop6zfqw8Gx4INGPSwkiLh7BqKychAf27BXEZBQSrUCLBibvd+xE7K/bTBpYnGFG9WRUnnS2e3tSlk3tdXrxwJF1y6g0/zrwt+teC7x6aQqeK41ywrkVrhx6AbJBJelhwl9Z2ZIyBW1or0fIkyTvAYp2goX8SPFdDFImgGhrEL2tG2mJ0ZkbV1ThJft6oRY5bVmaqE5S3ePjPrATRZNwcj7aTp9//Nitfgq7dWzrLfdIFCzNq48VLsTSTwbhkGxyG4j/Wy6jsv/6QorBk5mtHceusOe4GsMfoDHdHsNM4Ns0lr7X84E66kHeRiO2em4Jdcfgc+2ukXczxuPBYvneGVA3G77qUwJjHu+qs/F9Alxd7Quy7sbB2BHLf6PFsOlAWBCjGzMF00ni+IHBja4kPptK9tM5TKRztnqatR7iLLEhTLepLbKj0UVKNDLkPY1egc8cKmxngOesbBDfs15bZSWB/D9oAc/gWws9NhT/lIx1ayWQLbE2a4x5udEaJ+x3ogeLWIu4SBbyHaN6PRn4znF/ByY/SoTFWgl+d3a5t0+dpS1V3mVZl/wz0VjnBCiFLNiYkacaOSSEp9V7CxGwwuMHeWShmlruxg2hk3/bA2KDgLng== X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: f240aa9c-03dd-4d4c-4894-08d86aaa8fd1 X-MS-Exchange-CrossTenant-AuthSource: SN6PR11MB2718.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Oct 2020 10:20:06.7224 (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: 8WuwOOFQveMC2KuX0FSbN74GGcXDZNybpWlD3QpJkJundD12/oFNc5G5AInAJ3wTc+laHz6LEWeyYeITQUbuDA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR11MB4670 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jérôme Pouiller Commit e8d607ce0c81 ("staging: wfx: drop 'secure link' feature") had removed the 'secure link' feature. However, a few lines of codes were yet here. Fixes: e8d607ce0c81 ("staging: wfx: drop 'secure link' feature") Signed-off-by: Jérôme Pouiller --- .../bindings/net/wireless/siliabs,wfx.txt | 2 -- drivers/staging/wfx/debug.c | 17 ----------------- 2 files changed, 19 deletions(-) diff --git a/drivers/staging/wfx/Documentation/devicetree/bindings/net/wireless/siliabs,wfx.txt b/drivers/staging/wfx/Documentation/devicetree/bindings/net/wireless/siliabs,wfx.txt index 17db67559f5e..db8d06fc4baa 100644 --- a/drivers/staging/wfx/Documentation/devicetree/bindings/net/wireless/siliabs,wfx.txt +++ b/drivers/staging/wfx/Documentation/devicetree/bindings/net/wireless/siliabs,wfx.txt @@ -90,8 +90,6 @@ Some properties are recognized either by SPI and SDIO versions: this property, driver will disable most of power saving features. - config-file: Use an alternative file as PDS. Default is `wf200.pds`. Only necessary for development/debug purpose. - - slk_key: String representing hexadecimal value of secure link key to use. - Must contains 64 hexadecimal digits. Not supported in current version. WFx driver also supports `mac-address` and `local-mac-address` as described in Documentation/devicetree/bindings/net/ethernet.txt diff --git a/drivers/staging/wfx/debug.c b/drivers/staging/wfx/debug.c index ae44ffb66e34..4bd5f9fa21a1 100644 --- a/drivers/staging/wfx/debug.c +++ b/drivers/staging/wfx/debug.c @@ -230,21 +230,6 @@ static const struct file_operations wfx_send_pds_fops = { .write = wfx_send_pds_write, }; -static ssize_t wfx_burn_slk_key_write(struct file *file, - const char __user *user_buf, - size_t count, loff_t *ppos) -{ - struct wfx_dev *wdev = file->private_data; - - dev_info(wdev->dev, "this driver does not support secure link\n"); - return -EINVAL; -} - -static const struct file_operations wfx_burn_slk_key_fops = { - .open = simple_open, - .write = wfx_burn_slk_key_write, -}; - struct dbgfs_hif_msg { struct wfx_dev *wdev; struct completion complete; @@ -366,8 +351,6 @@ int wfx_debug_init(struct wfx_dev *wdev) debugfs_create_file("tx_power_loop", 0444, d, wdev, &wfx_tx_power_loop_fops); debugfs_create_file("send_pds", 0200, d, wdev, &wfx_send_pds_fops); - debugfs_create_file("burn_slk_key", 0200, d, wdev, - &wfx_burn_slk_key_fops); debugfs_create_file("send_hif_msg", 0600, d, wdev, &wfx_send_hif_msg_fops); debugfs_create_file("ps_timeout", 0600, d, wdev, &wfx_ps_timeout_fops);