Return-path: Received: from esa2.microchip.iphmx.com ([68.232.149.84]:20138 "EHLO esa2.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751339AbeEBHPr (ORCPT ); Wed, 2 May 2018 03:15:47 -0400 From: Ajay Singh To: CC: , , , , , , Ajay Singh Subject: [PATCH 17/21] staging: wilc1000: remove unnecessary header file inclusion for wilc Date: Wed, 2 May 2018 12:43:43 +0530 Message-ID: <1525245227-3924-18-git-send-email-ajay.kathat@microchip.com> (sfid-20180502_093236_544372_C04E17FC) In-Reply-To: <1525245227-3924-1-git-send-email-ajay.kathat@microchip.com> References: <1525245227-3924-1-git-send-email-ajay.kathat@microchip.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-wireless-owner@vger.kernel.org List-ID: Remove the unnecessary file inclusion in the source code. Also follow the convension to first include the system header then project specific header files. Signed-off-by: Ajay Singh --- drivers/staging/wilc1000/coreconfigurator.c | 5 +---- drivers/staging/wilc1000/host_interface.c | 14 -------------- drivers/staging/wilc1000/linux_mon.c | 2 -- drivers/staging/wilc1000/linux_wlan.c | 20 ++------------------ drivers/staging/wilc1000/wilc_debugfs.c | 2 -- drivers/staging/wilc1000/wilc_sdio.c | 10 ++-------- drivers/staging/wilc1000/wilc_spi.c | 12 ------------ drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 2 -- drivers/staging/wilc1000/wilc_wfi_netdevice.h | 21 +-------------------- drivers/staging/wilc1000/wilc_wlan.c | 3 --- drivers/staging/wilc1000/wilc_wlan_cfg.c | 1 - 11 files changed, 6 insertions(+), 86 deletions(-) diff --git a/drivers/staging/wilc1000/coreconfigurator.c b/drivers/staging/wilc1000/coreconfigurator.c index 43b0b21..9f9ca76 100644 --- a/drivers/staging/wilc1000/coreconfigurator.c +++ b/drivers/staging/wilc1000/coreconfigurator.c @@ -1,9 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 #include "coreconfigurator.h" -#include "wilc_wlan_if.h" -#include "wilc_wlan.h" -#include -#include + #define TAG_PARAM_OFFSET (MAC_HDR_LEN + TIME_STAMP_LEN + \ BEACON_INTERVAL_LEN + CAP_INFO_LEN) diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c index 52d3a2c..c647cea 100644 --- a/drivers/staging/wilc1000/host_interface.c +++ b/drivers/staging/wilc1000/host_interface.c @@ -1,18 +1,4 @@ // SPDX-License-Identifier: GPL-2.0 -#include -#include -#include -#include -#include -#include -#include -#include "host_interface.h" -#include -#include -#include "coreconfigurator.h" -#include "wilc_wlan.h" -#include "wilc_wlan_if.h" -#include #include "wilc_wfi_netdevice.h" #define HOST_IF_MSG_SCAN 0 diff --git a/drivers/staging/wilc1000/linux_mon.c b/drivers/staging/wilc1000/linux_mon.c index a08ee9c..a659110 100644 --- a/drivers/staging/wilc1000/linux_mon.c +++ b/drivers/staging/wilc1000/linux_mon.c @@ -1,7 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 #include "wilc_wfi_cfgoperations.h" -#include "wilc_wlan_if.h" -#include "wilc_wlan.h" struct wilc_wfi_radiotap_hdr { struct ieee80211_radiotap_header hdr; diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c index 4208548..7b883c0 100644 --- a/drivers/staging/wilc1000/linux_wlan.c +++ b/drivers/staging/wilc1000/linux_wlan.c @@ -1,28 +1,12 @@ // SPDX-License-Identifier: GPL-2.0 -#include "wilc_wfi_cfgoperations.h" -#include "wilc_wlan_if.h" -#include "wilc_wlan.h" - -#include -#include -#include -#include -#include #include #include - #include #include - -#include #include #include -#include -#include -#include -#include -#include -#include + +#include "wilc_wfi_cfgoperations.h" bool wilc_enable_ps = true; diff --git a/drivers/staging/wilc1000/wilc_debugfs.c b/drivers/staging/wilc1000/wilc_debugfs.c index 0deb61a..287c11b 100644 --- a/drivers/staging/wilc1000/wilc_debugfs.c +++ b/drivers/staging/wilc1000/wilc_debugfs.c @@ -13,8 +13,6 @@ #if defined(WILC_DEBUGFS) #include #include -#include -#include #include "wilc_wlan_if.h" diff --git a/drivers/staging/wilc1000/wilc_sdio.c b/drivers/staging/wilc1000/wilc_sdio.c index 54121c3..211be73 100644 --- a/drivers/staging/wilc1000/wilc_sdio.c +++ b/drivers/staging/wilc1000/wilc_sdio.c @@ -5,17 +5,11 @@ * Module Name: wilc_sdio.c */ -#include -#include "wilc_wlan_if.h" -#include "wilc_wlan.h" -#include "wilc_wfi_netdevice.h" #include -#include -#include -#include -#include #include +#include "wilc_wfi_netdevice.h" + #define SDIO_MODALIAS "wilc1000_sdio" #define SDIO_VENDOR_ID_WILC 0x0296 diff --git a/drivers/staging/wilc1000/wilc_spi.c b/drivers/staging/wilc1000/wilc_spi.c index 1f2dde1..6475263 100644 --- a/drivers/staging/wilc1000/wilc_spi.c +++ b/drivers/staging/wilc1000/wilc_spi.c @@ -5,21 +5,9 @@ * Module Name: wilc_spi.c */ -#include -#include -#include -#include -#include -#include -#include -#include -#include #include #include -#include -#include "wilc_wlan_if.h" -#include "wilc_wlan.h" #include "wilc_wfi_netdevice.h" struct wilc_spi { diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c index 579e04a2..5e7bb1f 100644 --- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c +++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c @@ -1,7 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 #include "wilc_wfi_cfgoperations.h" -#include "host_interface.h" -#include #define NO_ENCRYPT 0 #define ENCRYPT_ENABLED BIT(0) diff --git a/drivers/staging/wilc1000/wilc_wfi_netdevice.h b/drivers/staging/wilc1000/wilc_wfi_netdevice.h index 5448c6b..01cb9ac 100644 --- a/drivers/staging/wilc1000/wilc_wfi_netdevice.h +++ b/drivers/staging/wilc1000/wilc_wfi_netdevice.h @@ -7,33 +7,14 @@ #define PMKID_FOUND 1 #define NUM_STA_ASSOCIATED 8 -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include -#include #include #include #include #include -#include -#include + #include "host_interface.h" #include "wilc_wlan.h" -#include -#include -#include #define FLOW_CONTROL_LOWER_THRESHOLD 128 #define FLOW_CONTROL_UPPER_THRESHOLD 256 diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wilc_wlan.c index 43cf9b8..7147e0c 100644 --- a/drivers/staging/wilc1000/wilc_wlan.c +++ b/drivers/staging/wilc1000/wilc_wlan.c @@ -1,7 +1,4 @@ // SPDX-License-Identifier: GPL-2.0 -#include -#include "wilc_wlan_if.h" -#include "wilc_wlan.h" #include "wilc_wfi_netdevice.h" #include "wilc_wlan_cfg.h" diff --git a/drivers/staging/wilc1000/wilc_wlan_cfg.c b/drivers/staging/wilc1000/wilc_wlan_cfg.c index 2b44f4c..c0b9b70 100644 --- a/drivers/staging/wilc1000/wilc_wlan_cfg.c +++ b/drivers/staging/wilc1000/wilc_wlan_cfg.c @@ -8,7 +8,6 @@ /* */ /* ///////////////////////////////////////////////////////////////////////// */ -#include #include "wilc_wlan_if.h" #include "wilc_wlan.h" #include "wilc_wlan_cfg.h" -- 2.7.4