From 314fd52f01ead9528a5cda5a868425bb736d93a2 Mon Sep 17 00:00:00 2001 From: Muhammad Usama Anjum Date: Thu, 11 Feb 2021 19:36:37 +0500 Subject: [PATCH] staging: wfx: remove unused included header files Many header files have been included, but never used. Those header files have been removed. Signed-off-by: Muhammad Usama Anjum Link: https://lore.kernel.org/r/20210211143637.GA177425@LEGION Signed-off-by: Greg Kroah-Hartman --- drivers/staging/wfx/bh.c | 1 - drivers/staging/wfx/bh.h | 4 ---- drivers/staging/wfx/bus.h | 3 --- drivers/staging/wfx/bus_sdio.c | 6 ------ drivers/staging/wfx/bus_spi.c | 7 ------- drivers/staging/wfx/data_rx.c | 5 ----- drivers/staging/wfx/data_tx.c | 5 ----- drivers/staging/wfx/data_tx.h | 3 --- drivers/staging/wfx/debug.c | 6 ------ drivers/staging/wfx/fwio.c | 2 -- drivers/staging/wfx/hif_api_cmd.h | 4 ---- drivers/staging/wfx/hif_api_general.h | 9 --------- drivers/staging/wfx/hif_tx.c | 4 ---- drivers/staging/wfx/hif_tx_mib.c | 5 ----- drivers/staging/wfx/hwio.c | 3 --- drivers/staging/wfx/hwio.h | 2 -- drivers/staging/wfx/key.c | 2 -- drivers/staging/wfx/key.h | 2 -- drivers/staging/wfx/main.c | 7 ------- drivers/staging/wfx/main.h | 3 --- drivers/staging/wfx/queue.c | 4 ---- drivers/staging/wfx/queue.h | 3 --- drivers/staging/wfx/scan.h | 2 -- drivers/staging/wfx/sta.c | 6 ------ drivers/staging/wfx/sta.h | 2 -- drivers/staging/wfx/traces.h | 3 --- drivers/staging/wfx/wfx.h | 3 --- 27 files changed, 106 deletions(-) diff --git a/drivers/staging/wfx/bh.c b/drivers/staging/wfx/bh.c index ed53d0b..cd6bcfd 100644 --- a/drivers/staging/wfx/bh.c +++ b/drivers/staging/wfx/bh.c @@ -5,7 +5,6 @@ * Copyright (c) 2017-2020, Silicon Laboratories, Inc. * Copyright (c) 2010, ST-Ericsson */ -#include #include #include "bh.h" diff --git a/drivers/staging/wfx/bh.h b/drivers/staging/wfx/bh.h index 78c4932..92ef329 100644 --- a/drivers/staging/wfx/bh.h +++ b/drivers/staging/wfx/bh.h @@ -8,10 +8,6 @@ #ifndef WFX_BH_H #define WFX_BH_H -#include -#include -#include - struct wfx_dev; struct wfx_hif { diff --git a/drivers/staging/wfx/bus.h b/drivers/staging/wfx/bus.h index ca04b3d..ea39114 100644 --- a/drivers/staging/wfx/bus.h +++ b/drivers/staging/wfx/bus.h @@ -8,9 +8,6 @@ #ifndef WFX_BUS_H #define WFX_BUS_H -#include -#include - #define WFX_REG_CONFIG 0x0 #define WFX_REG_CONTROL 0x1 #define WFX_REG_IN_OUT_QUEUE 0x2 diff --git a/drivers/staging/wfx/bus_sdio.c b/drivers/staging/wfx/bus_sdio.c index e06d7e1..588edce 100644 --- a/drivers/staging/wfx/bus_sdio.c +++ b/drivers/staging/wfx/bus_sdio.c @@ -5,19 +5,13 @@ * Copyright (c) 2017-2020, Silicon Laboratories, Inc. * Copyright (c) 2010, ST-Ericsson */ -#include #include #include #include -#include #include -#include #include "bus.h" #include "wfx.h" -#include "hwio.h" -#include "main.h" -#include "bh.h" static const struct wfx_platform_data wfx_sdio_pdata = { .file_fw = "wfm_wf200", diff --git a/drivers/staging/wfx/bus_spi.c b/drivers/staging/wfx/bus_spi.c index a99125d..f89855a 100644 --- a/drivers/staging/wfx/bus_spi.c +++ b/drivers/staging/wfx/bus_spi.c @@ -6,19 +6,12 @@ * Copyright (c) 2011, Sagrad Inc. * Copyright (c) 2010, ST-Ericsson */ -#include -#include -#include #include -#include #include #include #include "bus.h" #include "wfx.h" -#include "hwio.h" -#include "main.h" -#include "bh.h" #define SET_WRITE 0x7FFF /* usage: and operation */ #define SET_READ 0x8000 /* usage: or operation */ diff --git a/drivers/staging/wfx/data_rx.c b/drivers/staging/wfx/data_rx.c index 385f2d4..2cfa1627 100644 --- a/drivers/staging/wfx/data_rx.c +++ b/drivers/staging/wfx/data_rx.c @@ -5,13 +5,8 @@ * Copyright (c) 2017-2020, Silicon Laboratories, Inc. * Copyright (c) 2010, ST-Ericsson */ -#include -#include - #include "data_rx.h" #include "wfx.h" -#include "bh.h" -#include "sta.h" static void wfx_rx_handle_ba(struct wfx_vif *wvif, struct ieee80211_mgmt *mgmt) { diff --git a/drivers/staging/wfx/data_tx.c b/drivers/staging/wfx/data_tx.c index 77fb104..76f26e3 100644 --- a/drivers/staging/wfx/data_tx.c +++ b/drivers/staging/wfx/data_tx.c @@ -6,14 +6,9 @@ * Copyright (c) 2010, ST-Ericsson */ #include -#include -#include "data_tx.h" #include "wfx.h" -#include "bh.h" #include "sta.h" -#include "queue.h" -#include "debug.h" #include "traces.h" #include "hif_tx_mib.h" diff --git a/drivers/staging/wfx/data_tx.h b/drivers/staging/wfx/data_tx.h index 401363d..6b30200 100644 --- a/drivers/staging/wfx/data_tx.h +++ b/drivers/staging/wfx/data_tx.h @@ -8,9 +8,6 @@ #ifndef WFX_DATA_TX_H #define WFX_DATA_TX_H -#include -#include - #include "hif_api_cmd.h" #include "hif_api_mib.h" diff --git a/drivers/staging/wfx/debug.c b/drivers/staging/wfx/debug.c index eedada7..3e87d13 100644 --- a/drivers/staging/wfx/debug.c +++ b/drivers/staging/wfx/debug.c @@ -5,15 +5,9 @@ * Copyright (c) 2017-2020, Silicon Laboratories, Inc. * Copyright (c) 2010, ST-Ericsson */ -#include -#include -#include - #include "debug.h" #include "wfx.h" #include "sta.h" -#include "main.h" -#include "hif_tx.h" #include "hif_tx_mib.h" #define CREATE_TRACE_POINTS diff --git a/drivers/staging/wfx/fwio.c b/drivers/staging/wfx/fwio.c index 1b8aec0..1bb9054 100644 --- a/drivers/staging/wfx/fwio.c +++ b/drivers/staging/wfx/fwio.c @@ -6,8 +6,6 @@ * Copyright (c) 2010, ST-Ericsson */ #include -#include -#include #include #include "fwio.h" diff --git a/drivers/staging/wfx/hif_api_cmd.h b/drivers/staging/wfx/hif_api_cmd.h index 58c9bb0..8b671c9a 100644 --- a/drivers/staging/wfx/hif_api_cmd.h +++ b/drivers/staging/wfx/hif_api_cmd.h @@ -8,10 +8,6 @@ #ifndef WFX_HIF_API_CMD_H #define WFX_HIF_API_CMD_H -#include - -#include "hif_api_general.h" - enum hif_requests_ids { HIF_REQ_ID_RESET = 0x0a, HIF_REQ_ID_READ_MIB = 0x05, diff --git a/drivers/staging/wfx/hif_api_general.h b/drivers/staging/wfx/hif_api_general.h index 2418894..70b253d 100644 --- a/drivers/staging/wfx/hif_api_general.h +++ b/drivers/staging/wfx/hif_api_general.h @@ -8,15 +8,6 @@ #ifndef WFX_HIF_API_GENERAL_H #define WFX_HIF_API_GENERAL_H -#ifdef __KERNEL__ -#include -#include -#else -#include -#include -#define __packed __attribute__((__packed__)) -#endif - #define HIF_ID_IS_INDICATION 0x80 #define HIF_COUNTER_MAX 7 diff --git a/drivers/staging/wfx/hif_tx.c b/drivers/staging/wfx/hif_tx.c index 63b4372..17dc133 100644 --- a/drivers/staging/wfx/hif_tx.c +++ b/drivers/staging/wfx/hif_tx.c @@ -6,11 +6,7 @@ * Copyright (c) 2017-2020, Silicon Laboratories, Inc. * Copyright (c) 2010, ST-Ericsson */ -#include - -#include "hif_tx.h" #include "wfx.h" -#include "bh.h" #include "hwio.h" #include "debug.h" #include "sta.h" diff --git a/drivers/staging/wfx/hif_tx_mib.c b/drivers/staging/wfx/hif_tx_mib.c index 1926cf1..6432ed8 100644 --- a/drivers/staging/wfx/hif_tx_mib.c +++ b/drivers/staging/wfx/hif_tx_mib.c @@ -6,13 +6,8 @@ * Copyright (c) 2010, ST-Ericsson * Copyright (C) 2010, ST-Ericsson SA */ - -#include - #include "wfx.h" -#include "hif_tx.h" #include "hif_tx_mib.h" -#include "hif_api_mib.h" int hif_set_output_power(struct wfx_vif *wvif, int val) { diff --git a/drivers/staging/wfx/hwio.c b/drivers/staging/wfx/hwio.c index 36fbc5b..089bb41 100644 --- a/drivers/staging/wfx/hwio.c +++ b/drivers/staging/wfx/hwio.c @@ -5,13 +5,10 @@ * Copyright (c) 2017-2020, Silicon Laboratories, Inc. * Copyright (c) 2010, ST-Ericsson */ -#include -#include #include #include "hwio.h" #include "wfx.h" -#include "bus.h" #include "traces.h" /* diff --git a/drivers/staging/wfx/hwio.h b/drivers/staging/wfx/hwio.h index 0b8e4f7..8bb9bcf 100644 --- a/drivers/staging/wfx/hwio.h +++ b/drivers/staging/wfx/hwio.h @@ -8,8 +8,6 @@ #ifndef WFX_HWIO_H #define WFX_HWIO_H -#include - struct wfx_dev; int wfx_data_read(struct wfx_dev *wdev, void *buf, size_t buf_len); diff --git a/drivers/staging/wfx/key.c b/drivers/staging/wfx/key.c index 2ab82be..c93d07d 100644 --- a/drivers/staging/wfx/key.c +++ b/drivers/staging/wfx/key.c @@ -5,12 +5,10 @@ * Copyright (c) 2017-2020, Silicon Laboratories, Inc. * Copyright (c) 2010, ST-Ericsson */ -#include #include #include "key.h" #include "wfx.h" -#include "hif_tx_mib.h" static int wfx_alloc_key(struct wfx_dev *wdev) { diff --git a/drivers/staging/wfx/key.h b/drivers/staging/wfx/key.h index 70a44d0..4dc9fea 100644 --- a/drivers/staging/wfx/key.h +++ b/drivers/staging/wfx/key.h @@ -8,8 +8,6 @@ #ifndef WFX_KEY_H #define WFX_KEY_H -#include - struct wfx_dev; struct wfx_vif; diff --git a/drivers/staging/wfx/main.c b/drivers/staging/wfx/main.c index e7bc1988..b9ea9a93 100644 --- a/drivers/staging/wfx/main.c +++ b/drivers/staging/wfx/main.c @@ -10,28 +10,21 @@ * Copyright (c) 2006, Michael Wu * Copyright (c) 2004-2006 Jean-Baptiste Note , et al. */ -#include #include #include -#include #include #include -#include #include -#include "main.h" #include "wfx.h" #include "fwio.h" #include "hwio.h" #include "bus.h" -#include "bh.h" #include "sta.h" #include "key.h" #include "scan.h" #include "debug.h" -#include "data_tx.h" #include "hif_tx_mib.h" -#include "hif_api_cmd.h" #define WFX_PDS_MAX_SIZE 1500 diff --git a/drivers/staging/wfx/main.h b/drivers/staging/wfx/main.h index a0db322..086bcc0 100644 --- a/drivers/staging/wfx/main.h +++ b/drivers/staging/wfx/main.h @@ -10,11 +10,8 @@ #ifndef WFX_MAIN_H #define WFX_MAIN_H -#include #include -#include "hif_api_general.h" - struct wfx_dev; struct hwbus_ops; diff --git a/drivers/staging/wfx/queue.c b/drivers/staging/wfx/queue.c index 31c37f6..3bddf28 100644 --- a/drivers/staging/wfx/queue.c +++ b/drivers/staging/wfx/queue.c @@ -5,13 +5,9 @@ * Copyright (c) 2017-2020, Silicon Laboratories, Inc. * Copyright (c) 2010, ST-Ericsson */ -#include #include -#include "queue.h" #include "wfx.h" -#include "sta.h" -#include "data_tx.h" #include "traces.h" void wfx_tx_lock(struct wfx_dev *wdev) diff --git a/drivers/staging/wfx/queue.h b/drivers/staging/wfx/queue.h index 80ba194..e43aa9d 100644 --- a/drivers/staging/wfx/queue.h +++ b/drivers/staging/wfx/queue.h @@ -8,9 +8,6 @@ #ifndef WFX_QUEUE_H #define WFX_QUEUE_H -#include -#include - struct wfx_dev; struct wfx_vif; diff --git a/drivers/staging/wfx/scan.h b/drivers/staging/wfx/scan.h index c7496a7..e5b7eef 100644 --- a/drivers/staging/wfx/scan.h +++ b/drivers/staging/wfx/scan.h @@ -8,8 +8,6 @@ #ifndef WFX_SCAN_H #define WFX_SCAN_H -#include - struct wfx_dev; struct wfx_vif; diff --git a/drivers/staging/wfx/sta.c b/drivers/staging/wfx/sta.c index 196779a..5585f9e 100644 --- a/drivers/staging/wfx/sta.c +++ b/drivers/staging/wfx/sta.c @@ -5,17 +5,11 @@ * Copyright (c) 2017-2020, Silicon Laboratories, Inc. * Copyright (c) 2010, ST-Ericsson */ -#include #include #include "sta.h" #include "wfx.h" -#include "fwio.h" -#include "bh.h" -#include "key.h" #include "scan.h" -#include "debug.h" -#include "hif_tx.h" #include "hif_tx_mib.h" #define HIF_MAX_ARP_IP_ADDRTABLE_ENTRIES 2 diff --git a/drivers/staging/wfx/sta.h b/drivers/staging/wfx/sta.h index d7b5df5..a3fb9fc 100644 --- a/drivers/staging/wfx/sta.h +++ b/drivers/staging/wfx/sta.h @@ -8,8 +8,6 @@ #ifndef WFX_STA_H #define WFX_STA_H -#include - struct wfx_dev; struct wfx_vif; diff --git a/drivers/staging/wfx/traces.h b/drivers/staging/wfx/traces.h index e34c7a5..afe1074 100644 --- a/drivers/staging/wfx/traces.h +++ b/drivers/staging/wfx/traces.h @@ -12,11 +12,8 @@ #define _WFX_TRACE_H #include -#include #include "bus.h" -#include "hif_api_cmd.h" -#include "hif_api_mib.h" /* The hell below need some explanations. For each symbolic number, we need to * define it with TRACE_DEFINE_ENUM() and in a list for __print_symbolic. diff --git a/drivers/staging/wfx/wfx.h b/drivers/staging/wfx/wfx.h index 9489868..a185b82 100644 --- a/drivers/staging/wfx/wfx.h +++ b/drivers/staging/wfx/wfx.h @@ -10,9 +10,6 @@ #ifndef WFX_H #define WFX_H -#include -#include -#include #include #include -- 2.7.4