Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Revert "staging: wfx: remove unused included header files"

This reverts commit 314fd52f01ead9528a5cda5a868425bb736d93a2.

It turns .h files into non-stand-alone when building, which might cause
problems in the long-run.

Reported-by: Jérôme Pouiller <jerome.pouiller@silabs.com>
Cc: Muhammad Usama Anjum <musamaanjum@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

+106
+1
drivers/staging/wfx/bh.c
··· 5 5 * Copyright (c) 2017-2020, Silicon Laboratories, Inc. 6 6 * Copyright (c) 2010, ST-Ericsson 7 7 */ 8 + #include <linux/gpio/consumer.h> 8 9 #include <net/mac80211.h> 9 10 10 11 #include "bh.h"
+4
drivers/staging/wfx/bh.h
··· 8 8 #ifndef WFX_BH_H 9 9 #define WFX_BH_H 10 10 11 + #include <linux/atomic.h> 12 + #include <linux/wait.h> 13 + #include <linux/workqueue.h> 14 + 11 15 struct wfx_dev; 12 16 13 17 struct wfx_hif {
+3
drivers/staging/wfx/bus.h
··· 8 8 #ifndef WFX_BUS_H 9 9 #define WFX_BUS_H 10 10 11 + #include <linux/mmc/sdio_func.h> 12 + #include <linux/spi/spi.h> 13 + 11 14 #define WFX_REG_CONFIG 0x0 12 15 #define WFX_REG_CONTROL 0x1 13 16 #define WFX_REG_IN_OUT_QUEUE 0x2
+6
drivers/staging/wfx/bus_sdio.c
··· 5 5 * Copyright (c) 2017-2020, Silicon Laboratories, Inc. 6 6 * Copyright (c) 2010, ST-Ericsson 7 7 */ 8 + #include <linux/module.h> 8 9 #include <linux/mmc/sdio.h> 9 10 #include <linux/mmc/sdio_func.h> 10 11 #include <linux/mmc/card.h> 12 + #include <linux/interrupt.h> 11 13 #include <linux/of_irq.h> 14 + #include <linux/irq.h> 12 15 13 16 #include "bus.h" 14 17 #include "wfx.h" 18 + #include "hwio.h" 19 + #include "main.h" 20 + #include "bh.h" 15 21 16 22 static const struct wfx_platform_data wfx_sdio_pdata = { 17 23 .file_fw = "wfm_wf200",
+7
drivers/staging/wfx/bus_spi.c
··· 6 6 * Copyright (c) 2011, Sagrad Inc. 7 7 * Copyright (c) 2010, ST-Ericsson 8 8 */ 9 + #include <linux/module.h> 10 + #include <linux/delay.h> 11 + #include <linux/gpio/consumer.h> 9 12 #include <linux/spi/spi.h> 13 + #include <linux/interrupt.h> 10 14 #include <linux/irq.h> 11 15 #include <linux/of.h> 12 16 13 17 #include "bus.h" 14 18 #include "wfx.h" 19 + #include "hwio.h" 20 + #include "main.h" 21 + #include "bh.h" 15 22 16 23 #define SET_WRITE 0x7FFF /* usage: and operation */ 17 24 #define SET_READ 0x8000 /* usage: or operation */
+5
drivers/staging/wfx/data_rx.c
··· 5 5 * Copyright (c) 2017-2020, Silicon Laboratories, Inc. 6 6 * Copyright (c) 2010, ST-Ericsson 7 7 */ 8 + #include <linux/etherdevice.h> 9 + #include <net/mac80211.h> 10 + 8 11 #include "data_rx.h" 9 12 #include "wfx.h" 13 + #include "bh.h" 14 + #include "sta.h" 10 15 11 16 static void wfx_rx_handle_ba(struct wfx_vif *wvif, struct ieee80211_mgmt *mgmt) 12 17 {
+5
drivers/staging/wfx/data_tx.c
··· 6 6 * Copyright (c) 2010, ST-Ericsson 7 7 */ 8 8 #include <net/mac80211.h> 9 + #include <linux/etherdevice.h> 9 10 11 + #include "data_tx.h" 10 12 #include "wfx.h" 13 + #include "bh.h" 11 14 #include "sta.h" 15 + #include "queue.h" 16 + #include "debug.h" 12 17 #include "traces.h" 13 18 #include "hif_tx_mib.h" 14 19
+3
drivers/staging/wfx/data_tx.h
··· 8 8 #ifndef WFX_DATA_TX_H 9 9 #define WFX_DATA_TX_H 10 10 11 + #include <linux/list.h> 12 + #include <net/mac80211.h> 13 + 11 14 #include "hif_api_cmd.h" 12 15 #include "hif_api_mib.h" 13 16
+6
drivers/staging/wfx/debug.c
··· 5 5 * Copyright (c) 2017-2020, Silicon Laboratories, Inc. 6 6 * Copyright (c) 2010, ST-Ericsson 7 7 */ 8 + #include <linux/debugfs.h> 9 + #include <linux/seq_file.h> 10 + #include <linux/crc32.h> 11 + 8 12 #include "debug.h" 9 13 #include "wfx.h" 10 14 #include "sta.h" 15 + #include "main.h" 16 + #include "hif_tx.h" 11 17 #include "hif_tx_mib.h" 12 18 13 19 #define CREATE_TRACE_POINTS
+2
drivers/staging/wfx/fwio.c
··· 6 6 * Copyright (c) 2010, ST-Ericsson 7 7 */ 8 8 #include <linux/firmware.h> 9 + #include <linux/slab.h> 10 + #include <linux/mm.h> 9 11 #include <linux/bitfield.h> 10 12 11 13 #include "fwio.h"
+4
drivers/staging/wfx/hif_api_cmd.h
··· 8 8 #ifndef WFX_HIF_API_CMD_H 9 9 #define WFX_HIF_API_CMD_H 10 10 11 + #include <linux/ieee80211.h> 12 + 13 + #include "hif_api_general.h" 14 + 11 15 enum hif_requests_ids { 12 16 HIF_REQ_ID_RESET = 0x0a, 13 17 HIF_REQ_ID_READ_MIB = 0x05,
+9
drivers/staging/wfx/hif_api_general.h
··· 8 8 #ifndef WFX_HIF_API_GENERAL_H 9 9 #define WFX_HIF_API_GENERAL_H 10 10 11 + #ifdef __KERNEL__ 12 + #include <linux/types.h> 13 + #include <linux/if_ether.h> 14 + #else 15 + #include <net/ethernet.h> 16 + #include <stdint.h> 17 + #define __packed __attribute__((__packed__)) 18 + #endif 19 + 11 20 #define HIF_ID_IS_INDICATION 0x80 12 21 #define HIF_COUNTER_MAX 7 13 22
+4
drivers/staging/wfx/hif_tx.c
··· 6 6 * Copyright (c) 2017-2020, Silicon Laboratories, Inc. 7 7 * Copyright (c) 2010, ST-Ericsson 8 8 */ 9 + #include <linux/etherdevice.h> 10 + 11 + #include "hif_tx.h" 9 12 #include "wfx.h" 13 + #include "bh.h" 10 14 #include "hwio.h" 11 15 #include "debug.h" 12 16 #include "sta.h"
+5
drivers/staging/wfx/hif_tx_mib.c
··· 6 6 * Copyright (c) 2010, ST-Ericsson 7 7 * Copyright (C) 2010, ST-Ericsson SA 8 8 */ 9 + 10 + #include <linux/etherdevice.h> 11 + 9 12 #include "wfx.h" 13 + #include "hif_tx.h" 10 14 #include "hif_tx_mib.h" 15 + #include "hif_api_mib.h" 11 16 12 17 int hif_set_output_power(struct wfx_vif *wvif, int val) 13 18 {
+3
drivers/staging/wfx/hwio.c
··· 5 5 * Copyright (c) 2017-2020, Silicon Laboratories, Inc. 6 6 * Copyright (c) 2010, ST-Ericsson 7 7 */ 8 + #include <linux/kernel.h> 9 + #include <linux/delay.h> 8 10 #include <linux/slab.h> 9 11 10 12 #include "hwio.h" 11 13 #include "wfx.h" 14 + #include "bus.h" 12 15 #include "traces.h" 13 16 14 17 /*
+2
drivers/staging/wfx/hwio.h
··· 8 8 #ifndef WFX_HWIO_H 9 9 #define WFX_HWIO_H 10 10 11 + #include <linux/types.h> 12 + 11 13 struct wfx_dev; 12 14 13 15 int wfx_data_read(struct wfx_dev *wdev, void *buf, size_t buf_len);
+2
drivers/staging/wfx/key.c
··· 5 5 * Copyright (c) 2017-2020, Silicon Laboratories, Inc. 6 6 * Copyright (c) 2010, ST-Ericsson 7 7 */ 8 + #include <linux/etherdevice.h> 8 9 #include <net/mac80211.h> 9 10 10 11 #include "key.h" 11 12 #include "wfx.h" 13 + #include "hif_tx_mib.h" 12 14 13 15 static int wfx_alloc_key(struct wfx_dev *wdev) 14 16 {
+2
drivers/staging/wfx/key.h
··· 8 8 #ifndef WFX_KEY_H 9 9 #define WFX_KEY_H 10 10 11 + #include <net/mac80211.h> 12 + 11 13 struct wfx_dev; 12 14 struct wfx_vif; 13 15
+7
drivers/staging/wfx/main.c
··· 10 10 * Copyright (c) 2006, Michael Wu <flamingice@sourmilk.net> 11 11 * Copyright (c) 2004-2006 Jean-Baptiste Note <jbnote@gmail.com>, et al. 12 12 */ 13 + #include <linux/module.h> 13 14 #include <linux/of.h> 14 15 #include <linux/of_net.h> 16 + #include <linux/gpio/consumer.h> 15 17 #include <linux/mmc/sdio_func.h> 16 18 #include <linux/spi/spi.h> 19 + #include <linux/etherdevice.h> 17 20 #include <linux/firmware.h> 18 21 22 + #include "main.h" 19 23 #include "wfx.h" 20 24 #include "fwio.h" 21 25 #include "hwio.h" 22 26 #include "bus.h" 27 + #include "bh.h" 23 28 #include "sta.h" 24 29 #include "key.h" 25 30 #include "scan.h" 26 31 #include "debug.h" 32 + #include "data_tx.h" 27 33 #include "hif_tx_mib.h" 34 + #include "hif_api_cmd.h" 28 35 29 36 #define WFX_PDS_MAX_SIZE 1500 30 37
+3
drivers/staging/wfx/main.h
··· 10 10 #ifndef WFX_MAIN_H 11 11 #define WFX_MAIN_H 12 12 13 + #include <linux/device.h> 13 14 #include <linux/gpio/consumer.h> 15 + 16 + #include "hif_api_general.h" 14 17 15 18 struct wfx_dev; 16 19 struct hwbus_ops;
+4
drivers/staging/wfx/queue.c
··· 5 5 * Copyright (c) 2017-2020, Silicon Laboratories, Inc. 6 6 * Copyright (c) 2010, ST-Ericsson 7 7 */ 8 + #include <linux/sched.h> 8 9 #include <net/mac80211.h> 9 10 11 + #include "queue.h" 10 12 #include "wfx.h" 13 + #include "sta.h" 14 + #include "data_tx.h" 11 15 #include "traces.h" 12 16 13 17 void wfx_tx_lock(struct wfx_dev *wdev)
+3
drivers/staging/wfx/queue.h
··· 8 8 #ifndef WFX_QUEUE_H 9 9 #define WFX_QUEUE_H 10 10 11 + #include <linux/skbuff.h> 12 + #include <linux/atomic.h> 13 + 11 14 struct wfx_dev; 12 15 struct wfx_vif; 13 16
+2
drivers/staging/wfx/scan.h
··· 8 8 #ifndef WFX_SCAN_H 9 9 #define WFX_SCAN_H 10 10 11 + #include <net/mac80211.h> 12 + 11 13 struct wfx_dev; 12 14 struct wfx_vif; 13 15
+6
drivers/staging/wfx/sta.c
··· 5 5 * Copyright (c) 2017-2020, Silicon Laboratories, Inc. 6 6 * Copyright (c) 2010, ST-Ericsson 7 7 */ 8 + #include <linux/etherdevice.h> 8 9 #include <net/mac80211.h> 9 10 10 11 #include "sta.h" 11 12 #include "wfx.h" 13 + #include "fwio.h" 14 + #include "bh.h" 15 + #include "key.h" 12 16 #include "scan.h" 17 + #include "debug.h" 18 + #include "hif_tx.h" 13 19 #include "hif_tx_mib.h" 14 20 15 21 #define HIF_MAX_ARP_IP_ADDRTABLE_ENTRIES 2
+2
drivers/staging/wfx/sta.h
··· 8 8 #ifndef WFX_STA_H 9 9 #define WFX_STA_H 10 10 11 + #include <net/mac80211.h> 12 + 11 13 struct wfx_dev; 12 14 struct wfx_vif; 13 15
+3
drivers/staging/wfx/traces.h
··· 12 12 #define _WFX_TRACE_H 13 13 14 14 #include <linux/tracepoint.h> 15 + #include <net/mac80211.h> 15 16 16 17 #include "bus.h" 18 + #include "hif_api_cmd.h" 19 + #include "hif_api_mib.h" 17 20 18 21 /* The hell below need some explanations. For each symbolic number, we need to 19 22 * define it with TRACE_DEFINE_ENUM() and in a list for __print_symbolic.
+3
drivers/staging/wfx/wfx.h
··· 10 10 #ifndef WFX_H 11 11 #define WFX_H 12 12 13 + #include <linux/completion.h> 14 + #include <linux/workqueue.h> 15 + #include <linux/mutex.h> 13 16 #include <linux/nospec.h> 14 17 #include <net/mac80211.h> 15 18