From b9086af019145dc43ffa6276bcea994ec7a51496 Mon Sep 17 00:00:00 2001 From: Srinivas Girigowda Date: Sat, 14 Oct 2017 14:41:13 -0700 Subject: [PATCH] qcacld-3.0: Fix checkpatch warnings (QUOTED_WHITESPACE_BEFORE_NEWLINE) Fix checkpatch warnings (QUOTED_WHITESPACE_BEFORE_NEWLINE). Change-Id: I8901c49fa48c8a9c3a9c83c6be5ff003fe0eae62 CRs-Fixed: 2126814 --- core/hdd/src/wlan_hdd_ioctl.c | 2 +- core/hdd/src/wlan_hdd_wext.c | 4 ++-- core/sap/dfs/src/dfs.c | 18 +++++++++--------- core/sap/dfs/src/dfs_bindetects.c | 8 ++++---- core/sap/dfs/src/dfs_misc.c | 2 +- core/sap/dfs/src/dfs_process_radarevent.c | 4 ++-- uapi/linux/osapi_linux.h | 4 ++-- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/core/hdd/src/wlan_hdd_ioctl.c b/core/hdd/src/wlan_hdd_ioctl.c index 9854d687753c..ea2453b0cdb7 100644 --- a/core/hdd/src/wlan_hdd_ioctl.c +++ b/core/hdd/src/wlan_hdd_ioctl.c @@ -2223,7 +2223,7 @@ static int hdd_get_dwell_time(struct hdd_config *pCfg, uint8_t *command, return 0; } if (strncmp(command, "GETDWELLTIME", 12) == 0) { - *len = scnprintf(extra, n, "GETDWELLTIME %u \n", + *len = scnprintf(extra, n, "GETDWELLTIME %u\n", (int)pCfg->nActiveMaxChnTime); return 0; } diff --git a/core/hdd/src/wlan_hdd_wext.c b/core/hdd/src/wlan_hdd_wext.c index 97c1ef06c9f1..357e60bbcaf5 100644 --- a/core/hdd/src/wlan_hdd_wext.c +++ b/core/hdd/src/wlan_hdd_wext.c @@ -7938,7 +7938,7 @@ static int __iw_get_char_setnone(struct net_device *dev, buf = scnprintf(extra + len, WE_MAX_STR_LEN - len, "\n HDD Conn State - %s " - "\n \n SME State:" + "\n\n SME State:" "\n Neighbour Roam State - %s" "\n CSR State - %s" "\n CSR Substate - %s", @@ -7962,7 +7962,7 @@ static int __iw_get_char_setnone(struct net_device *dev, /* Printing Lim State starting with global lim states */ buf = scnprintf(extra + len, WE_MAX_STR_LEN - len, - "\n \n LIM STATES:-" + "\n\n LIM STATES:-" "\n Global Sme State - %s " "\n Global mlm State - %s " "\n", mac_trace_get_lim_sme_state diff --git a/core/sap/dfs/src/dfs.c b/core/sap/dfs/src/dfs.c index 1db896213a6f..aa2506b5f1d7 100644 --- a/core/sap/dfs/src/dfs.c +++ b/core/sap/dfs/src/dfs.c @@ -443,7 +443,7 @@ int dfs_attach(struct ieee80211com *ic) * is available. */ if (dfs_init_radar_filters(ic, &radar_info)) { - DFS_PRINTK(" %s: Radar Filter Intialization Failed \n", + DFS_PRINTK(" %s: Radar Filter Intialization Failed\n", __func__); return 1; } @@ -866,11 +866,11 @@ dfs_control(struct ieee80211com *ic, u_int id, break; case DFS_DISABLE_FFT: /* UMACDFS: TODO: val = ath_hal_dfs_config_fft(sc->sc_ah, false); */ - DFS_PRINTK("%s TODO disable FFT val=0x%x \n", __func__, val); + DFS_PRINTK("%s TODO disable FFT val=0x%x\n", __func__, val); break; case DFS_ENABLE_FFT: /* UMACDFS TODO: val = ath_hal_dfs_config_fft(sc->sc_ah, true); */ - DFS_PRINTK("%s TODO enable FFT val=0x%x \n", __func__, val); + DFS_PRINTK("%s TODO enable FFT val=0x%x\n", __func__, val); break; case DFS_SET_DEBUG_LEVEL: if (insize < sizeof(uint32_t) || !indata) { @@ -878,7 +878,7 @@ dfs_control(struct ieee80211com *ic, u_int id, break; } dfs->dfs_debug_mask = *(uint32_t *) indata; - DFS_PRINTK("%s debug level now = 0x%x \n", + DFS_PRINTK("%s debug level now = 0x%x\n", __func__, dfs->dfs_debug_mask); if (dfs->dfs_debug_mask & ATH_DEBUG_DFS3) { /* Enable debug Radar Event */ @@ -893,7 +893,7 @@ dfs_control(struct ieee80211com *ic, u_int id, break; } dfs->ath_dfs_false_rssi_thres = *(uint32_t *) indata; - DFS_PRINTK("%s false RSSI threshold now = 0x%x \n", + DFS_PRINTK("%s false RSSI threshold now = 0x%x\n", __func__, dfs->ath_dfs_false_rssi_thres); break; case DFS_SET_PEAK_MAG: @@ -902,7 +902,7 @@ dfs_control(struct ieee80211com *ic, u_int id, break; } dfs->ath_dfs_peak_mag = *(uint32_t *) indata; - DFS_PRINTK("%s peak_mag now = 0x%x \n", + DFS_PRINTK("%s peak_mag now = 0x%x\n", __func__, dfs->ath_dfs_peak_mag); break; case DFS_IGNORE_CAC: @@ -915,7 +915,7 @@ dfs_control(struct ieee80211com *ic, u_int id, } else { dfs->ic->ic_dfs_state.ignore_cac = 0; } - DFS_PRINTK("%s ignore cac = 0x%x \n", + DFS_PRINTK("%s ignore cac = 0x%x\n", __func__, dfs->ic->ic_dfs_state.ignore_cac); break; case DFS_SET_NOL_TIMEOUT: @@ -928,7 +928,7 @@ dfs_control(struct ieee80211com *ic, u_int id, } else { dfs->ath_dfs_nol_timeout = DFS_NOL_TIMEOUT_S; } - DFS_PRINTK("%s nol timeout = %d sec \n", + DFS_PRINTK("%s nol timeout = %d sec\n", __func__, dfs->ath_dfs_nol_timeout); break; #ifndef ATH_DFS_RADAR_DETECTION_ONLY @@ -998,7 +998,7 @@ dfs_control(struct ieee80211com *ic, u_int id, case DFS_BANGRADAR: #if 0 /* MERGE_TBD */ if (sc->sc_nostabeacons) { - printk("No radar detection Enabled \n"); + printk("No radar detection Enabled\n"); break; } #endif diff --git a/core/sap/dfs/src/dfs_bindetects.c b/core/sap/dfs/src/dfs_bindetects.c index 2c3b799ddbcb..b5c45a4aea7a 100644 --- a/core/sap/dfs/src/dfs_bindetects.c +++ b/core/sap/dfs/src/dfs_bindetects.c @@ -100,7 +100,7 @@ dfs_bin_fixedpattern_check(struct ath_dfs *dfs, struct dfs_filter *rf, window_start = (start_ts + (refpri * n)) - (primargin + n); window_end = window_start + 2 * (primargin + n); DFS_DPRINTK(dfs, ATH_DEBUG_DFS2, - "window_start %u window_end %u \n", + "window_start %u window_end %u\n", (uint32_t) window_start, (uint32_t) window_end); for (i = 0; i < pl->pl_numelems; i++) { prev_event_ts = pl->pl_elems[index].p_time; @@ -109,7 +109,7 @@ dfs_bin_fixedpattern_check(struct ath_dfs *dfs, struct dfs_filter *rf, next_index = (index + 1) & DFS_MAX_PULSE_BUFFER_MASK; next_event_ts = pl->pl_elems[next_index].p_time; DFS_DPRINTK(dfs, ATH_DEBUG_DFS2, - "ts %u \n", (uint32_t) event_ts); + "ts %u\n", (uint32_t) event_ts); if ((event_ts <= window_end) && (event_ts >= window_start)) { deltadur = @@ -118,7 +118,7 @@ dfs_bin_fixedpattern_check(struct ath_dfs *dfs, struct dfs_filter *rf, || ((dur != 1) && (deltadur <= 2))) { numpulses++; DFS_DPRINTK(dfs, ATH_DEBUG_DFS2, - "numpulses %u \n", + "numpulses %u\n", numpulses); break; } @@ -136,7 +136,7 @@ dfs_bin_fixedpattern_check(struct ath_dfs *dfs, struct dfs_filter *rf, && (deltadur <= 2))) { numpulses++; DFS_DPRINTK(dfs, ATH_DEBUG_DFS2, - "zero PRI: numpulses %u \n", + "zero PRI: numpulses %u\n", numpulses); break; } diff --git a/core/sap/dfs/src/dfs_misc.c b/core/sap/dfs/src/dfs_misc.c index e9716ded80a3..37b78bdf4e45 100644 --- a/core/sap/dfs/src/dfs_misc.c +++ b/core/sap/dfs/src/dfs_misc.c @@ -124,7 +124,7 @@ dfs_get_pri_margin(struct ath_dfs *dfs, int is_extchan_detect, ext_chan_busy = dfs->dfs_rinfo.dfs_ext_chan_busy; DFS_DPRINTK(dfs, ATH_DEBUG_DFS2, - " PRI Use cached copy of ext_chan_busy extchanbusy=%d \n", + " PRI Use cached copy of ext_chan_busy extchanbusy=%d\n", ext_chan_busy); } } diff --git a/core/sap/dfs/src/dfs_process_radarevent.c b/core/sap/dfs/src/dfs_process_radarevent.c index 68fa6944de35..56d4a5841732 100644 --- a/core/sap/dfs/src/dfs_process_radarevent.c +++ b/core/sap/dfs/src/dfs_process_radarevent.c @@ -491,7 +491,7 @@ int dfs_process_radarevent(struct ath_dfs *dfs, __func__, re.sidx, re.re_dur, diff_ts); QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, - "\n%s: Modify pulse dur to fit valid range \n", + "\n%s: Modify pulse dur to fit valid range\n", __func__); re.re_dur = DFS_TYPE4_WAR_VALID_PULSE_DURATION; @@ -528,7 +528,7 @@ int dfs_process_radarevent(struct ath_dfs *dfs, __func__, re.sidx, re.re_dur, diff_ts); QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, - "%s:Modify ETSI pulse dur to valid range \n", + "%s:Modify ETSI pulse dur to valid range\n", __func__); re.re_dur = DFS_ETSI_WAR_VALID_PULSE_DURATION; diff --git a/uapi/linux/osapi_linux.h b/uapi/linux/osapi_linux.h index cc3e4cfe6ce0..d6eb339f7b81 100644 --- a/uapi/linux/osapi_linux.h +++ b/uapi/linux/osapi_linux.h @@ -138,13 +138,13 @@ typedef struct timer_list A_TIMER; extern unsigned int panic_on_assert; #define A_ASSERT(expr) \ if (!(expr)) { \ - printk(KERN_ALERT "Debug Assert Caught, File %s, Line: %d, Test:%s \n", __FILE__, __LINE__, # expr); \ + printk(KERN_ALERT "Debug Assert Caught, File %s, Line: %d, Test:%s\n", __FILE__, __LINE__, # expr); \ if (panic_on_assert) panic(# expr); \ } #else #define A_ASSERT(expr) \ if (!(expr)) { \ - printk(KERN_ALERT "Debug Assert Caught, File %s, Line: %d, Test:%s \n", __FILE__, __LINE__, # expr); \ + printk(KERN_ALERT "Debug Assert Caught, File %s, Line: %d, Test:%s\n", __FILE__, __LINE__, # expr); \ } #endif #else