From patchwork Wed Jun 27 00:06:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Burton X-Patchwork-Id: 935187 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=mips.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=wavesemi.onmicrosoft.com header.i=@wavesemi.onmicrosoft.com header.b="JuRcIY6r"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41Fjsh5R8yz9s0n for ; Wed, 27 Jun 2018 10:07:52 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964840AbeF0AHu (ORCPT ); Tue, 26 Jun 2018 20:07:50 -0400 Received: from mail-eopbgr700099.outbound.protection.outlook.com ([40.107.70.99]:11034 "EHLO NAM04-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754591AbeF0AGd (ORCPT ); Tue, 26 Jun 2018 20:06:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wavesemi.onmicrosoft.com; s=selector1-wavecomp-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=3lA9G+hmZ6mhlmpgzUCIvpZok0YqIBEznyK0PXXDnj0=; b=JuRcIY6rLuALt4c+IvSxbcHgx7qbJnxZbzMGzSTbT0urUVutjdT7cmZ4dycZxNeEm4jiVgui40AkdIqymFb4quyiTGHyzesTEy8gkERlQ3VCtOOnGKJNx7jRGEJe7w1Dn5QBNptK5iRj191N2Lpyujogisxts3kd9yfddJ8MxyY= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=pburton@wavecomp.com; Received: from pburton-laptop.mipstec.com (4.16.204.77) by DM6PR08MB4940.namprd08.prod.outlook.com (2603:10b6:5:4b::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.884.21; Wed, 27 Jun 2018 00:06:30 +0000 From: Paul Burton To: netdev@vger.kernel.org Cc: "David S . Miller" , Andrew Lunn , paul.burton@mips.com Subject: [PATCH v7 01/11] net: pch_gbe: Remove unused struct pch_gbe_adapter fields Date: Tue, 26 Jun 2018 17:06:02 -0700 Message-Id: <20180627000612.27263-2-paul.burton@mips.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180627000612.27263-1-paul.burton@mips.com> References: <20180627000612.27263-1-paul.burton@mips.com> MIME-Version: 1.0 X-Originating-IP: [4.16.204.77] X-ClientProxiedBy: MWHPR1701CA0014.namprd17.prod.outlook.com (2603:10b6:301:14::24) To DM6PR08MB4940.namprd08.prod.outlook.com (2603:10b6:5:4b::21) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 25bd7062-e010-4901-125f-08d5dbc1d635 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(7021125)(8989117)(4534165)(7022125)(4603075)(4627221)(201702281549075)(8990107)(7048125)(7024125)(7027125)(7028125)(7023125)(5600026)(711020)(2017052603328)(7153060)(7193020); SRVR:DM6PR08MB4940; X-Microsoft-Exchange-Diagnostics: 1; DM6PR08MB4940; 3:VuU86JTzWsL+f/bSUB3fg4vZbTtVeXMNwVH3vnhj3j7ARB2jwe6q7IvPTitneQQHAWzgTtotCA/qk4qxx+s2RgAokT8Bb1nO7ydSJl50ysJ+z7XxjKJYn2oI2JWgwWUlfttZ4j0n0lK5FR138TovfaFgA6kuge4Lw83f7MZt12gS90OiNuipXW5iq+JOPENgAzvGlu+80dOMGFqnwt6rAg2VUl0vuFNPfMkPf4+3zAkNaw3r3Wyq/dn+FOgG6Jou; 25:MwsxSOOY9YxltVXlgzG2ushCdSpNiXHqA4y37Ex0eF03l67MDCeRdnVW4srt7FIxFYpLiooijn2HPk+mj8DQ+W3yWGYm1so+pvFiOftrov6Y9GFnrPJJ1Ie+CSaGvTfnp8c7jdnLeRxD56/lfPt7SgC/wbF3lmW70pdcZOFciqMY6RoKTcJy5BExGWRMy0a1Wy1DkoSZkiFdNPZuP7dahSVZux7thxDMx6xgZSt2QDrq5mGXHW1H7tKbRWt94G2nIV/DvnNf43L/fKMD+IntLsHTooSxOgiaGOo7VfFPt/wJ2Lfgh/bVhb3CF0Rhyk+jzB+uEvR/CHM4HfY5AN4P0Q==; 31:Zwev56w7A4S3PytYoBGU/5CIUkg/RuNo3nxuHZoy3GkDcfFiZwrvoHyKn5ypb8PB2HFoNfCaXqTfpJAUHQrSC2HsXykfK8DyvtTqRedkB86y/wRmXzrogKEBye9WiPll/UYAl4dYNZRms+hRLEWPQkUzEkswrugZc666xt5M9EuTFhkypqhB6cnjZkvT6+Khz5IT1yxKc40+PZgTRSafnuOEoXy7YpLfp410qxBhbAo= X-MS-TrafficTypeDiagnostic: DM6PR08MB4940: X-Microsoft-Exchange-Diagnostics: 1; DM6PR08MB4940; 20:blqHvyYrha881/cpNbGHs0O2J1EINdPaGerYsoBIouVeMA2GMhSnOz+WMJLhPXo8FyCkegzDZ61VLR2Hemxhe/qaPT69SK2QGvcWHXBrerCvZhTqYWQ2mtJmD3T16OYGJm3OoMkUOqtDB6EWdoR3RaLZK3Xth+oRygOQUS0x4o9Kd6Fw8GeZWxS45BNn2H77TEtmx8NzPqQ3LojvFJhmBDAs3h5Sc8XFEJejR9aXOjIgXu6P6iQ1Cm4ID2QG0leF; 4:Lm0OGdVo/RGLg3xvk7CDSeRpYmIBxaRM5g95edr5OvC/y0Qj6w+5ihpC3BzjZD29FtfLccCvNXN6Ao7yCF1Z1wJZN4QXyVdFZdEJrrjNFp51nMaPRFUw6aWILy3wjJ1h5s8b9pADnAwJLi+4vUITKCTB4kQ8US+/bBGv/Q/h30tQo+PhJnDxxQSm9swgRRLTydZ55bDXYViDqw8CoMyfeIUb4R46j1SD590DcDMxlD/Yok0oX/h2qd/IhFucFiVt079MrSy2E3cif1lIKfHSiGTj7whg1t2ySPoZ71s3qgFXceY2JuIpCd6v59o6PUPX X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(9452136761055); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(3002001)(10201501046)(93006095)(3231254)(944501410)(52105095)(149027)(150027)(6041310)(2016111802025)(20161123562045)(20161123560045)(20161123564045)(20161123558120)(6043046)(6072148)(201708071742011)(7699016); SRVR:DM6PR08MB4940; BCL:0; PCL:0; RULEID:; SRVR:DM6PR08MB4940; X-Forefront-PRVS: 0716E70AB6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(366004)(346002)(136003)(39840400004)(376002)(396003)(199004)(189003)(52116002)(36756003)(6666003)(5660300001)(16526019)(51416003)(66066001)(6916009)(2351001)(42882007)(14444005)(316002)(386003)(53416004)(54906003)(47776003)(26005)(76176011)(6506007)(186003)(16586007)(6486002)(2361001)(48376002)(486006)(6116002)(8936002)(956004)(476003)(50466002)(3846002)(446003)(1076002)(6512007)(69596002)(2906002)(25786009)(4326008)(81156014)(8676002)(50226002)(575784001)(107886003)(7736002)(2616005)(44832011)(106356001)(11346002)(97736004)(68736007)(105586002)(305945005)(478600001)(81166006)(53936002); DIR:OUT; SFP:1102; SCL:1; SRVR:DM6PR08MB4940; H:pburton-laptop.mipstec.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: wavecomp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; DM6PR08MB4940; 23:IxCgHyRrBo6e3WPzcL75MvuACYNs9XJhBHmfvPLh7oVbm1kb/FrdRWi+x89o3P7hkCt7jF9whGf0+Dg73uq7EEw3fxhMKJOCdkZFBrOHk5eN/pljMrjCoVRHTpjZ6r8EvrC4JN9HCYJQmIlpEnyaRQpg5/g4NjuxrMxnOKMTATTJGlzMfN5N9beBtzSf8pCTDqw68Oa37W6U+kHJ8iKg6e/Q9O/YL0wPSo8R+3TNa9ham1bS5jt2qneJCcXkoVHDowKbVlniAZzPuUAxSoZoRW6paLIG0fo7N2TBLyIAiBixcpMc3hN3oqSuTPW2dzj8Up9OKF0itQiWCPEWEOooU1ry3QyR56+RBpTH4G5O/PUF3W/xnpyL/qRRaHQKZrC0V48UJa+PEnJ+CzC9d4XVnfYel9p9YrjYh6KRvF5GYllECN50/ffpLRxQLrFBOlLBvXnbIzWTp2K79m9hjpx3DsAo7Zl1BK9DOSm+Z4ar50g4uRHG0VcGY/U6sc5bY88MlubvJvj2aHM/pnLPfaw5bhIon78IThimvQzxeAk0UhqXYSG4PTZ2YuTGYBySC7SaallrfR7NFxUcj1nfL/6KFddTmztCn6rQtYYI73rdRWQwMkobGBvV2miiWZ707XFMYc2NpJtT/w670QJpuL9RCzP+SvdYZwbCAh7cWiftNoSl9hSO6hU2cC6tzxt2FdYYVRlzdmBLv4cQHx7jlIYtotccpyFJ9VJkZ41bg0Qzgs6R7BrFWWtcDSZh5Hvl/g922uYt0Pi2SCLHfh6wYiA3GZWoAOQTDFLlKJ5RX6My7jSpHilOjsV+XqEsefU2F30+TI/sOxRRI1wM5KTF7DBQkuIz/0SV7blCPrxXJ8PwiO6nklN9MC5JSVm3O1QrzAqbXiFVCX/qsp5PL63JWE1/hDk6/1/TVB6zL5EM0Gvpf21xHt+ij0uRWjRmnVQ56ruZ6AjKlCEhrgr+J6ebDQHt09hIqXz5eleUUDA1icLqYXvVZLwvt2p0z6Ne8wZJyUdsvPCDWwJDrsH3WjNbCh4MPs0+/Es3Gz/l3pu/QvGO4X0AGLNrCbmCexsWsB9PIY+mrJ6Tt4MTjo5HkmM4WlvrOCexT0kXvI2HUD6PrvOVB0Npizrl5QFT1X9liTG34jfpRgg5t6xcGRq5Yo5LBiEgR+gKPq3e7ZsiVPo7fSbeCWcupR9GG67jJZolnuVhxGPpDNPPS9F2uc5BDggK1glR58pQsZ4soKO0v21dju2G0bqzm1DxKIiOaiYkuUgBoLfRck73bgPZOc5Wcu/RNhhIJwj5wPTZY5uDzode0eeOXwqdHSrwlt913dmCoMoOqx6Q+P8iTCqh7if++h0ejY1bcDXaR0LRXdcgKf27PTUkvoQ= X-Microsoft-Antispam-Message-Info: yKy7KK62j5TCSOyJLhRfmrRDY1kfF/p6r5Wtsvh2B/C1uYXGXE8BjVXBDYF8wm55axZv3aS9OHygA1FkH7UhP5Ff+lm6ltI/Ba9IwQXFwvMYUnjIbMlpRwhN5+7Lko/MBK/A1dc2DDUWd+tDwiMfGsI59fOuTdVBZm50lPussMJqZ1IY5dWmyTao7lA1ZEQZ57JTFtKkAOhlWu30Elt56gz+HmOWLBLGRTb0nEnuwLdP6O8BALA8HfbP4K86D0/Jxt+Uad/bicJ9du3ESq+F6FmYgeBt4mPYSriPGQ11+asPWlzdE+0jgIedtZZCdvF0t1UtSdl1UhC2IqPKW5Prjy/B0jFi/7GSaD41vQ43hMo= X-Microsoft-Exchange-Diagnostics: 1; DM6PR08MB4940; 6:6e/v2zOXi9ekS5JOjQkUlkQAEglTLNN4Cqd7YF7wvrtRCMOei9KDBWv02mFDtPKEZ2LdRdnf61zWqaVehOb2QtzcstMEbqbgGzzQzPRMW6d03d8WCU46PtaT8QKSHj9ItTaQ51KlhK2iyI5EfJOyC+7VQ/rJtoRBO9oQ+4n4p11mSa/uSD0yweSppNLPnjMj+m7k5FqwQWZIxrAfEY+hRIO6pT0IjzFEhei3W9YqMUjInedEJXshNGKGdF9L5qpRzn5R3Pxlry7EAqMtzqWwcIXWetmTHYaOWAlmBws5a5DruIrNEZ52w3XUwCD9deN1A6OAJe1VDwbxWCXiwC/V09kFMRK3KMrQaQK4v+9stQfUZtOcAGb1HsB8Cze3i1/4ZYsjUsp1nHeAm21MgjRcsZ4pgBhHrfS7qT4fHlmIc0qgb7VdMzfHQXwYRSb+IqxmsCexye0POZ8Mk3BV0a53nQ==; 5:ZojH6oCh3exXbLUh6anmIQBlrFixu5TnSCbU4FDe10+SwRB3HPXR/lmDOy01aBedRIKXRxvC0jL2jYc32wedppOPu/QIUYMpKGs4iBRrieoZbD+dY8AO50jTBEvbIahBO9+GWYev1XbkGqchen0cUG7IaqjzNcZNIZtJ7e17LZw=; 24:ImqCoSVIPItUgTmdLlww7VAWWKkI9CtwBJ7FYVKuOrU8C2Ff6ZfBnISu2VX/cKKisLT9XT/ZC9pUhZ0MgIxB9HB3JpsjF8vHD308KnZ5kjs= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM6PR08MB4940; 7:5W72/GrXofcLNqO1cByu8P8wtxigJDW+GkjxXq2/+PcH24q+G2cjdMXRi/GgstRK5q7EEx113KqAoI3nOw60jqjYHS+z2/FYYS8wLQhr0salLYtZ6DYSnXAlaJ5lSF5duW4X4Z0ybVHQHzFg7P3lFpvrz6bSCr6rTW3fvO7FLXanqXQYo7iVBsnjXoBTRjgnkyLX1HSEV9Z2MaLWKKyJW2XbH9GwR9aazkgHCx393wSkZ0G6t9jcpj/xgJtu30a/ X-OriginatorOrg: mips.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jun 2018 00:06:30.8194 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 25bd7062-e010-4901-125f-08d5dbc1d635 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 463607d3-1db3-40a0-8a29-970c56230104 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR08MB4940 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Remove a bunch of unused fields from struct pch_gbe_adapter. Among these polling_netdev, config_space & led_status are entirely unused. ethtool_lock is initialized but we never attempt to acquire the lock, so that is effectively unused too. A msg_enable field was documented but missing, so drop that from the kerneldoc comment. Signed-off-by: Paul Burton Cc: Andrew Lunn Cc: David S. Miller Cc: netdev@vger.kernel.org --- Changes in v7: New patch drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h | 9 --------- drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 1 - 2 files changed, 10 deletions(-) diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h index 44c2f291e766..be218ac81f21 100644 --- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h +++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h @@ -555,11 +555,9 @@ struct pch_gbe_privdata { /** * struct pch_gbe_adapter - board specific private data structure * @stats_lock: Spinlock structure for status - * @ethtool_lock: Spinlock structure for ethtool * @irq_sem: Semaphore for interrupt * @netdev: Pointer of network device structure * @pdev: Pointer of pci device structure - * @polling_netdev: Pointer of polling network device structure * @napi: NAPI structure * @hw: Pointer of hardware structure * @stats: Hardware status @@ -567,9 +565,6 @@ struct pch_gbe_privdata { * @mii: MII information structure * @watchdog_timer: Watchdog timer list * @wake_up_evt: Wake up event - * @config_space: Configuration space - * @msg_enable: Driver message level - * @led_status: LED status * @tx_ring: Pointer of Tx descriptor ring structure * @rx_ring: Pointer of Rx descriptor ring structure * @rx_buffer_len: Receive buffer length @@ -579,12 +574,10 @@ struct pch_gbe_privdata { struct pch_gbe_adapter { spinlock_t stats_lock; - spinlock_t ethtool_lock; atomic_t irq_sem; struct net_device *netdev; struct pci_dev *pdev; int irq; - struct net_device *polling_netdev; struct napi_struct napi; struct pch_gbe_hw hw; struct pch_gbe_hw_stats stats; @@ -592,8 +585,6 @@ struct pch_gbe_adapter { struct mii_if_info mii; struct timer_list watchdog_timer; u32 wake_up_evt; - u32 *config_space; - unsigned long led_status; struct pch_gbe_tx_ring *tx_ring; struct pch_gbe_rx_ring *rx_ring; unsigned long rx_buffer_len; diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c index 43c0c10dfeb7..8908ef654d94 100644 --- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c +++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c @@ -1998,7 +1998,6 @@ static int pch_gbe_sw_init(struct pch_gbe_adapter *adapter) } spin_lock_init(&adapter->hw.miim_lock); spin_lock_init(&adapter->stats_lock); - spin_lock_init(&adapter->ethtool_lock); atomic_set(&adapter->irq_sem, 0); pch_gbe_irq_disable(adapter);