From 027caaab0de784c57535d794459cf34cf6f12592 Mon Sep 17 00:00:00 2001 From: Ajay Singh Date: Tue, 5 Nov 2019 09:51:33 +0000 Subject: staging: wilc1000: added proper spacing for comments Added proper space for the comments and added newline before the comments inside a struct. Signed-off-by: Ajay Singh Link: https://lore.kernel.org/r/20191105095058.24223-6-ajay.kathat@microchip.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/wilc1000/mon.c | 2 +- drivers/staging/wilc1000/netdev.h | 19 ++++++++++++++----- drivers/staging/wilc1000/wlan.h | 2 +- drivers/staging/wilc1000/wlan_cfg.c | 2 +- drivers/staging/wilc1000/wlan_if.h | 8 ++++---- 5 files changed, 21 insertions(+), 12 deletions(-) diff --git a/drivers/staging/wilc1000/mon.c b/drivers/staging/wilc1000/mon.c index 853fe3056a53..48ac33f06f63 100644 --- a/drivers/staging/wilc1000/mon.c +++ b/drivers/staging/wilc1000/mon.c @@ -220,7 +220,7 @@ struct net_device *wilc_wfi_init_mon_interface(struct wilc *wl, { struct wilc_wfi_mon_priv *priv; - /*If monitor interface is already initialized, return it*/ + /* If monitor interface is already initialized, return it */ if (wl->monitor_dev) return wl->monitor_dev; diff --git a/drivers/staging/wilc1000/netdev.h b/drivers/staging/wilc1000/netdev.h index 42e0eb192b86..cd8f0d72caaa 100644 --- a/drivers/staging/wilc1000/netdev.h +++ b/drivers/staging/wilc1000/netdev.h @@ -60,7 +60,7 @@ struct sta_info { u8 sta_associated_bss[WILC_MAX_NUM_STA][ETH_ALEN]; }; -/*Parameters needed for host interface for remaining on channel*/ +/* Parameters needed for host interface for remaining on channel */ struct wilc_wfi_p2p_listen_params { struct ieee80211_channel *listen_ch; u32 listen_duration; @@ -145,11 +145,13 @@ struct wilc_priv { struct wilc_pmkid_attr pmkid_list; u8 wep_key[4][WLAN_KEY_LEN_WEP104]; u8 wep_key_len[4]; + /* The real interface that the monitor is on */ struct net_device *real_ndev; struct wilc_wfi_key *wilc_gtk[WILC_MAX_NUM_STA]; struct wilc_wfi_key *wilc_ptk[WILC_MAX_NUM_STA]; u8 wilc_groupkey; + /* mutexes */ struct mutex scan_req_lock; bool p2p_listen_state; @@ -224,16 +226,21 @@ struct wilc { int close; u8 vif_num; struct list_head vif_list; - /*protect vif list*/ + + /* protect vif list */ struct mutex vif_mutex; struct srcu_struct srcu; u8 open_ifcs; - /*protect head of transmit queue*/ + + /* protect head of transmit queue */ struct mutex txq_add_to_head_cs; - /*protect txq_entry_t transmit queue*/ + + /* protect txq_entry_t transmit queue */ spinlock_t txq_spinlock; - /*protect rxq_entry_t receiver queue*/ + + /* protect rxq_entry_t receiver queue */ struct mutex rxq_cs; + /* lock to protect hif access */ struct mutex hif_cs; @@ -245,6 +252,7 @@ struct wilc { struct task_struct *txq_thread; int quit; + /* lock to protect issue of wid command to firmware */ struct mutex cfg_cmd_lock; struct wilc_cfg_frame cfg_frame; @@ -271,6 +279,7 @@ struct wilc { struct wilc_cfg cfg; void *bus_data; struct net_device *monitor_dev; + /* deinit lock */ struct mutex deinit_lock; u8 sta_ch; diff --git a/drivers/staging/wilc1000/wlan.h b/drivers/staging/wilc1000/wlan.h index 7469fa47d588..1f6957cf2e9c 100644 --- a/drivers/staging/wilc1000/wlan.h +++ b/drivers/staging/wilc1000/wlan.h @@ -190,7 +190,7 @@ #define ENABLE_RX_VMM (SEL_VMM_TBL1 | EN_VMM) #define ENABLE_TX_VMM (SEL_VMM_TBL0 | EN_VMM) -/*time for expiring the completion of cfg packets*/ +/* time for expiring the completion of cfg packets */ #define WILC_CFG_PKTS_TIMEOUT msecs_to_jiffies(2000) #define IS_MANAGMEMENT 0x100 diff --git a/drivers/staging/wilc1000/wlan_cfg.c b/drivers/staging/wilc1000/wlan_cfg.c index 904f84077ff7..c5b1678c7b5e 100644 --- a/drivers/staging/wilc1000/wlan_cfg.c +++ b/drivers/staging/wilc1000/wlan_cfg.c @@ -378,7 +378,7 @@ void wilc_wlan_cfg_indicate_rx(struct wilc *wilc, u8 *frame, int size, wilc_wlan_parse_info_frame(wilc, frame); rsp->type = WILC_CFG_RSP_STATUS; rsp->seq_no = msg_id; - /*call host interface info parse as well*/ + /* call host interface info parse as well */ wilc_gnrl_async_info_received(wilc, frame - 4, size + 4); break; diff --git a/drivers/staging/wilc1000/wlan_if.h b/drivers/staging/wilc1000/wlan_if.h index 70eac586f80c..7c7ee66c35f5 100644 --- a/drivers/staging/wilc1000/wlan_if.h +++ b/drivers/staging/wilc1000/wlan_if.h @@ -750,10 +750,10 @@ enum { WID_REMOVE_KEY = 0x301E, WID_ASSOC_REQ_INFO = 0x301F, WID_ASSOC_RES_INFO = 0x3020, - WID_MANUFACTURER = 0x3026, /*Added for CAPI tool */ - WID_MODEL_NAME = 0x3027, /*Added for CAPI tool */ - WID_MODEL_NUM = 0x3028, /*Added for CAPI tool */ - WID_DEVICE_NAME = 0x3029, /*Added for CAPI tool */ + WID_MANUFACTURER = 0x3026, /* Added for CAPI tool */ + WID_MODEL_NAME = 0x3027, /* Added for CAPI tool */ + WID_MODEL_NUM = 0x3028, /* Added for CAPI tool */ + WID_DEVICE_NAME = 0x3029, /* Added for CAPI tool */ /* NMAC String WID list */ WID_SET_OPERATION_MODE = 0x3079, -- cgit v1.2.3