提交 14e105cd 编写于 作者: K Kalle Valo

ath10k: fix checkpatch warnings related to spaces

Fix checkpatch warnings about use of spaces with operators:

spaces preferred around that '*' (ctx:VxV)

This has been recently added to checkpatch.
Signed-off-by: NKalle Valo <kvalo@qca.qualcomm.com>
上级 cfe9011a
...@@ -1050,11 +1050,11 @@ int ath10k_ce_alloc_pipe(struct ath10k *ar, int ce_id, ...@@ -1050,11 +1050,11 @@ int ath10k_ce_alloc_pipe(struct ath10k *ar, int ce_id,
* *
* For the lack of a better place do the check here. * For the lack of a better place do the check here.
*/ */
BUILD_BUG_ON(2*TARGET_NUM_MSDU_DESC > BUILD_BUG_ON(2 * TARGET_NUM_MSDU_DESC >
(CE_HTT_H2T_MSG_SRC_NENTRIES - 1)); (CE_HTT_H2T_MSG_SRC_NENTRIES - 1));
BUILD_BUG_ON(2*TARGET_10X_NUM_MSDU_DESC > BUILD_BUG_ON(2 * TARGET_10X_NUM_MSDU_DESC >
(CE_HTT_H2T_MSG_SRC_NENTRIES - 1)); (CE_HTT_H2T_MSG_SRC_NENTRIES - 1));
BUILD_BUG_ON(2*TARGET_TLV_NUM_MSDU_DESC > BUILD_BUG_ON(2 * TARGET_TLV_NUM_MSDU_DESC >
(CE_HTT_H2T_MSG_SRC_NENTRIES - 1)); (CE_HTT_H2T_MSG_SRC_NENTRIES - 1));
ce_state->ar = ar; ce_state->ar = ar;
......
...@@ -408,7 +408,7 @@ static inline u32 ath10k_ce_base_address(struct ath10k *ar, unsigned int ce_id) ...@@ -408,7 +408,7 @@ static inline u32 ath10k_ce_base_address(struct ath10k *ar, unsigned int ce_id)
/* Ring arithmetic (modulus number of entries in ring, which is a pwr of 2). */ /* Ring arithmetic (modulus number of entries in ring, which is a pwr of 2). */
#define CE_RING_DELTA(nentries_mask, fromidx, toidx) \ #define CE_RING_DELTA(nentries_mask, fromidx, toidx) \
(((int)(toidx)-(int)(fromidx)) & (nentries_mask)) (((int)(toidx) - (int)(fromidx)) & (nentries_mask))
#define CE_RING_IDX_INCR(nentries_mask, idx) (((idx) + 1) & (nentries_mask)) #define CE_RING_IDX_INCR(nentries_mask, idx) (((idx) + 1) & (nentries_mask))
#define CE_RING_IDX_ADD(nentries_mask, idx, num) \ #define CE_RING_IDX_ADD(nentries_mask, idx, num) \
......
...@@ -44,8 +44,8 @@ ...@@ -44,8 +44,8 @@
#define ATH10K_SCAN_ID 0 #define ATH10K_SCAN_ID 0
#define WMI_READY_TIMEOUT (5 * HZ) #define WMI_READY_TIMEOUT (5 * HZ)
#define ATH10K_FLUSH_TIMEOUT_HZ (5*HZ) #define ATH10K_FLUSH_TIMEOUT_HZ (5 * HZ)
#define ATH10K_CONNECTION_LOSS_HZ (3*HZ) #define ATH10K_CONNECTION_LOSS_HZ (3 * HZ)
#define ATH10K_NUM_CHANS 39 #define ATH10K_NUM_CHANS 39
/* Antenna noise floor */ /* Antenna noise floor */
...@@ -334,7 +334,7 @@ struct ath10k_sta { ...@@ -334,7 +334,7 @@ struct ath10k_sta {
#endif #endif
}; };
#define ATH10K_VDEV_SETUP_TIMEOUT_HZ (5*HZ) #define ATH10K_VDEV_SETUP_TIMEOUT_HZ (5 * HZ)
enum ath10k_beacon_state { enum ath10k_beacon_state {
ATH10K_BEACON_SCHEDULED = 0, ATH10K_BEACON_SCHEDULED = 0,
......
...@@ -57,7 +57,7 @@ enum ath10k_dbg_aggr_mode { ...@@ -57,7 +57,7 @@ enum ath10k_dbg_aggr_mode {
}; };
/* FIXME: How to calculate the buffer size sanely? */ /* FIXME: How to calculate the buffer size sanely? */
#define ATH10K_FW_STATS_BUF_SIZE (1024*1024) #define ATH10K_FW_STATS_BUF_SIZE (1024 * 1024)
extern unsigned int ath10k_debug_mask; extern unsigned int ath10k_debug_mask;
......
...@@ -297,10 +297,10 @@ struct ath10k_htc_svc_conn_resp { ...@@ -297,10 +297,10 @@ struct ath10k_htc_svc_conn_resp {
#define ATH10K_NUM_CONTROL_TX_BUFFERS 2 #define ATH10K_NUM_CONTROL_TX_BUFFERS 2
#define ATH10K_HTC_MAX_LEN 4096 #define ATH10K_HTC_MAX_LEN 4096
#define ATH10K_HTC_MAX_CTRL_MSG_LEN 256 #define ATH10K_HTC_MAX_CTRL_MSG_LEN 256
#define ATH10K_HTC_WAIT_TIMEOUT_HZ (1*HZ) #define ATH10K_HTC_WAIT_TIMEOUT_HZ (1 * HZ)
#define ATH10K_HTC_CONTROL_BUFFER_SIZE (ATH10K_HTC_MAX_CTRL_MSG_LEN + \ #define ATH10K_HTC_CONTROL_BUFFER_SIZE (ATH10K_HTC_MAX_CTRL_MSG_LEN + \
sizeof(struct ath10k_htc_hdr)) sizeof(struct ath10k_htc_hdr))
#define ATH10K_HTC_CONN_SVC_TIMEOUT_HZ (1*HZ) #define ATH10K_HTC_CONN_SVC_TIMEOUT_HZ (1 * HZ)
struct ath10k_htc_ep { struct ath10k_htc_ep {
struct ath10k_htc *htc; struct ath10k_htc *htc;
......
...@@ -208,7 +208,7 @@ int ath10k_htt_init(struct ath10k *ar) ...@@ -208,7 +208,7 @@ int ath10k_htt_init(struct ath10k *ar)
return 0; return 0;
} }
#define HTT_TARGET_VERSION_TIMEOUT_HZ (3*HZ) #define HTT_TARGET_VERSION_TIMEOUT_HZ (3 * HZ)
static int ath10k_htt_verify_version(struct ath10k_htt *htt) static int ath10k_htt_verify_version(struct ath10k_htt *htt)
{ {
......
...@@ -3846,7 +3846,7 @@ static int ath10k_scan_stop(struct ath10k *ar) ...@@ -3846,7 +3846,7 @@ static int ath10k_scan_stop(struct ath10k *ar)
goto out; goto out;
} }
ret = wait_for_completion_timeout(&ar->scan.completed, 3*HZ); ret = wait_for_completion_timeout(&ar->scan.completed, 3 * HZ);
if (ret == 0) { if (ret == 0) {
ath10k_warn(ar, "failed to receive scan abortion completion: timed out\n"); ath10k_warn(ar, "failed to receive scan abortion completion: timed out\n");
ret = -ETIMEDOUT; ret = -ETIMEDOUT;
...@@ -3926,7 +3926,7 @@ static int ath10k_start_scan(struct ath10k *ar, ...@@ -3926,7 +3926,7 @@ static int ath10k_start_scan(struct ath10k *ar,
if (ret) if (ret)
return ret; return ret;
ret = wait_for_completion_timeout(&ar->scan.started, 1*HZ); ret = wait_for_completion_timeout(&ar->scan.started, 1 * HZ);
if (ret == 0) { if (ret == 0) {
ret = ath10k_scan_stop(ar); ret = ath10k_scan_stop(ar);
if (ret) if (ret)
...@@ -6168,7 +6168,7 @@ static int ath10k_conf_tx(struct ieee80211_hw *hw, ...@@ -6168,7 +6168,7 @@ static int ath10k_conf_tx(struct ieee80211_hw *hw,
return ret; return ret;
} }
#define ATH10K_ROC_TIMEOUT_HZ (2*HZ) #define ATH10K_ROC_TIMEOUT_HZ (2 * HZ)
static int ath10k_remain_on_channel(struct ieee80211_hw *hw, static int ath10k_remain_on_channel(struct ieee80211_hw *hw,
struct ieee80211_vif *vif, struct ieee80211_vif *vif,
...@@ -6232,7 +6232,7 @@ static int ath10k_remain_on_channel(struct ieee80211_hw *hw, ...@@ -6232,7 +6232,7 @@ static int ath10k_remain_on_channel(struct ieee80211_hw *hw,
goto exit; goto exit;
} }
ret = wait_for_completion_timeout(&ar->scan.on_channel, 3*HZ); ret = wait_for_completion_timeout(&ar->scan.on_channel, 3 * HZ);
if (ret == 0) { if (ret == 0) {
ath10k_warn(ar, "failed to switch to channel for roc scan\n"); ath10k_warn(ar, "failed to switch to channel for roc scan\n");
......
...@@ -438,7 +438,7 @@ Fw Mode/SubMode Mask ...@@ -438,7 +438,7 @@ Fw Mode/SubMode Mask
((HOST_INTEREST->hi_pwr_save_flags & HI_PWR_SAVE_LPL_ENABLED)) ((HOST_INTEREST->hi_pwr_save_flags & HI_PWR_SAVE_LPL_ENABLED))
#define HI_DEV_LPL_TYPE_GET(_devix) \ #define HI_DEV_LPL_TYPE_GET(_devix) \
(HOST_INTEREST->hi_pwr_save_flags & ((HI_PWR_SAVE_LPL_DEV_MASK) << \ (HOST_INTEREST->hi_pwr_save_flags & ((HI_PWR_SAVE_LPL_DEV_MASK) << \
(HI_PWR_SAVE_LPL_DEV0_LSB + (_devix)*2))) (HI_PWR_SAVE_LPL_DEV0_LSB + (_devix) * 2)))
#define HOST_INTEREST_SMPS_IS_ALLOWED() \ #define HOST_INTEREST_SMPS_IS_ALLOWED() \
((HOST_INTEREST->hi_smps_options & HI_SMPS_ALLOW_MASK)) ((HOST_INTEREST->hi_smps_options & HI_SMPS_ALLOW_MASK))
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#define ATH10K_QUIET_PERIOD_MIN 25 #define ATH10K_QUIET_PERIOD_MIN 25
#define ATH10K_QUIET_START_OFFSET 10 #define ATH10K_QUIET_START_OFFSET 10
#define ATH10K_HWMON_NAME_LEN 15 #define ATH10K_HWMON_NAME_LEN 15
#define ATH10K_THERMAL_SYNC_TIMEOUT_HZ (5*HZ) #define ATH10K_THERMAL_SYNC_TIMEOUT_HZ (5 * HZ)
#define ATH10K_THERMAL_THROTTLE_MAX 100 #define ATH10K_THERMAL_THROTTLE_MAX 100
struct ath10k_thermal { struct ath10k_thermal {
......
...@@ -166,7 +166,7 @@ static int ath10k_wait_for_peer_common(struct ath10k *ar, int vdev_id, ...@@ -166,7 +166,7 @@ static int ath10k_wait_for_peer_common(struct ath10k *ar, int vdev_id,
(mapped == expect_mapped || (mapped == expect_mapped ||
test_bit(ATH10K_FLAG_CRASH_FLUSH, &ar->dev_flags)); test_bit(ATH10K_FLAG_CRASH_FLUSH, &ar->dev_flags));
}), 3*HZ); }), 3 * HZ);
if (time_left == 0) if (time_left == 0)
return -ETIMEDOUT; return -ETIMEDOUT;
......
...@@ -968,8 +968,8 @@ enum wmi_tlv_service { ...@@ -968,8 +968,8 @@ enum wmi_tlv_service {
#define WMI_SERVICE_IS_ENABLED(wmi_svc_bmap, svc_id, len) \ #define WMI_SERVICE_IS_ENABLED(wmi_svc_bmap, svc_id, len) \
((svc_id) < (len) && \ ((svc_id) < (len) && \
__le32_to_cpu((wmi_svc_bmap)[(svc_id)/(sizeof(u32))]) & \ __le32_to_cpu((wmi_svc_bmap)[(svc_id) / (sizeof(u32))]) & \
BIT((svc_id)%(sizeof(u32)))) BIT((svc_id) % (sizeof(u32))))
#define SVCMAP(x, y, len) \ #define SVCMAP(x, y, len) \
do { \ do { \
......
...@@ -1808,7 +1808,7 @@ int ath10k_wmi_cmd_send(struct ath10k *ar, struct sk_buff *skb, u32 cmd_id) ...@@ -1808,7 +1808,7 @@ int ath10k_wmi_cmd_send(struct ath10k *ar, struct sk_buff *skb, u32 cmd_id)
ret = -ESHUTDOWN; ret = -ESHUTDOWN;
(ret != -EAGAIN); (ret != -EAGAIN);
}), 3*HZ); }), 3 * HZ);
if (ret) if (ret)
dev_kfree_skb_any(skb); dev_kfree_skb_any(skb);
......
...@@ -405,8 +405,8 @@ static inline char *wmi_service_name(int service_id) ...@@ -405,8 +405,8 @@ static inline char *wmi_service_name(int service_id)
#define WMI_SERVICE_IS_ENABLED(wmi_svc_bmap, svc_id, len) \ #define WMI_SERVICE_IS_ENABLED(wmi_svc_bmap, svc_id, len) \
((svc_id) < (len) && \ ((svc_id) < (len) && \
__le32_to_cpu((wmi_svc_bmap)[(svc_id)/(sizeof(u32))]) & \ __le32_to_cpu((wmi_svc_bmap)[(svc_id) / (sizeof(u32))]) & \
BIT((svc_id)%(sizeof(u32)))) BIT((svc_id) % (sizeof(u32))))
#define SVCMAP(x, y, len) \ #define SVCMAP(x, y, len) \
do { \ do { \
...@@ -1309,7 +1309,7 @@ enum wmi_10x_event_id { ...@@ -1309,7 +1309,7 @@ enum wmi_10x_event_id {
WMI_10X_PDEV_TPC_CONFIG_EVENTID, WMI_10X_PDEV_TPC_CONFIG_EVENTID,
WMI_10X_GPIO_INPUT_EVENTID, WMI_10X_GPIO_INPUT_EVENTID,
WMI_10X_PDEV_UTF_EVENTID = WMI_10X_END_EVENTID-1, WMI_10X_PDEV_UTF_EVENTID = WMI_10X_END_EVENTID - 1,
}; };
enum wmi_10_2_cmd_id { enum wmi_10_2_cmd_id {
...@@ -2042,8 +2042,8 @@ struct wmi_10x_service_ready_event { ...@@ -2042,8 +2042,8 @@ struct wmi_10x_service_ready_event {
struct wlan_host_mem_req mem_reqs[0]; struct wlan_host_mem_req mem_reqs[0];
} __packed; } __packed;
#define WMI_SERVICE_READY_TIMEOUT_HZ (5*HZ) #define WMI_SERVICE_READY_TIMEOUT_HZ (5 * HZ)
#define WMI_UNIFIED_READY_TIMEOUT_HZ (5*HZ) #define WMI_UNIFIED_READY_TIMEOUT_HZ (5 * HZ)
struct wmi_ready_event { struct wmi_ready_event {
__le32 sw_version; __le32 sw_version;
...@@ -4389,14 +4389,14 @@ enum wmi_vdev_subtype_10_4 { ...@@ -4389,14 +4389,14 @@ enum wmi_vdev_subtype_10_4 {
/* /*
* Indicates that AP VDEV uses hidden ssid. only valid for * Indicates that AP VDEV uses hidden ssid. only valid for
* AP/GO */ * AP/GO */
#define WMI_VDEV_START_HIDDEN_SSID (1<<0) #define WMI_VDEV_START_HIDDEN_SSID (1 << 0)
/* /*
* Indicates if robust management frame/management frame * Indicates if robust management frame/management frame
* protection is enabled. For GO/AP vdevs, it indicates that * protection is enabled. For GO/AP vdevs, it indicates that
* it may support station/client associations with RMF enabled. * it may support station/client associations with RMF enabled.
* For STA/client vdevs, it indicates that sta will * For STA/client vdevs, it indicates that sta will
* associate with AP with RMF enabled. */ * associate with AP with RMF enabled. */
#define WMI_VDEV_START_PMF_ENABLED (1<<1) #define WMI_VDEV_START_PMF_ENABLED (1 << 1)
struct wmi_p2p_noa_descriptor { struct wmi_p2p_noa_descriptor {
__le32 type_count; /* 255: continuous schedule, 0: reserved */ __le32 type_count; /* 255: continuous schedule, 0: reserved */
...@@ -5342,7 +5342,7 @@ enum wmi_sta_ps_param_pspoll_count { ...@@ -5342,7 +5342,7 @@ enum wmi_sta_ps_param_pspoll_count {
#define WMI_UAPSD_AC_TYPE_TRIG 1 #define WMI_UAPSD_AC_TYPE_TRIG 1
#define WMI_UAPSD_AC_BIT_MASK(ac, type) \ #define WMI_UAPSD_AC_BIT_MASK(ac, type) \
((type == WMI_UAPSD_AC_TYPE_DELI) ? (1<<(ac<<1)) : (1<<((ac<<1)+1))) ((type == WMI_UAPSD_AC_TYPE_DELI) ? (1 << (ac << 1)) : (1 << ((ac << 1) + 1)))
enum wmi_sta_ps_param_uapsd { enum wmi_sta_ps_param_uapsd {
WMI_STA_PS_UAPSD_AC0_DELIVERY_EN = (1 << 0), WMI_STA_PS_UAPSD_AC0_DELIVERY_EN = (1 << 0),
...@@ -5757,7 +5757,7 @@ struct wmi_rate_set { ...@@ -5757,7 +5757,7 @@ struct wmi_rate_set {
* the rates are filled from least significant byte to most * the rates are filled from least significant byte to most
* significant byte. * significant byte.
*/ */
__le32 rates[(MAX_SUPPORTED_RATES/4)+1]; __le32 rates[(MAX_SUPPORTED_RATES / 4) + 1];
} __packed; } __packed;
struct wmi_rate_set_arg { struct wmi_rate_set_arg {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册