From: Jérôme Pouiller <jerome.pouiller@xxxxxxxxxx> A few lines were not yet formatted on 100 columns. Signed-off-by: Jérôme Pouiller <jerome.pouiller@xxxxxxxxxx> --- drivers/staging/wfx/fwio.c | 3 +-- drivers/staging/wfx/hif_rx.c | 3 +-- drivers/staging/wfx/hif_tx.c | 3 +-- drivers/staging/wfx/hif_tx_mib.c | 3 +-- drivers/staging/wfx/hwio.c | 9 +++------ drivers/staging/wfx/sta.c | 7 +++---- drivers/staging/wfx/sta.h | 3 +-- 7 files changed, 11 insertions(+), 20 deletions(-) diff --git a/drivers/staging/wfx/fwio.c b/drivers/staging/wfx/fwio.c index 9005a6fe48c8..3d1b8a135dc0 100644 --- a/drivers/staging/wfx/fwio.c +++ b/drivers/staging/wfx/fwio.c @@ -192,8 +192,7 @@ static int upload_firmware(struct wfx_dev *wdev, const u8 *data, size_t len) return ret; } if (ktime_compare(now, start)) - dev_dbg(wdev->dev, "answer after %lldus\n", - ktime_us_delta(now, start)); + dev_dbg(wdev->dev, "answer after %lldus\n", ktime_us_delta(now, start)); ret = wfx_sram_write_dma_safe(wdev, WFX_DNLD_FIFO + (offs % DNLD_FIFO_SIZE), data + offs, DNLD_BLOCK_SIZE); diff --git a/drivers/staging/wfx/hif_rx.c b/drivers/staging/wfx/hif_rx.c index 302bdb2bf036..64ca8acb8e4f 100644 --- a/drivers/staging/wfx/hif_rx.c +++ b/drivers/staging/wfx/hif_rx.c @@ -244,8 +244,7 @@ static int wfx_hif_generic_indication(struct wfx_dev *wdev, mutex_unlock(&wdev->tx_power_loop_info_lock); return 0; default: - dev_err(wdev->dev, "generic_indication: unknown indication type: %#.8x\n", - type); + dev_err(wdev->dev, "generic_indication: unknown indication type: %#.8x\n", type); return -EIO; } } diff --git a/drivers/staging/wfx/hif_tx.c b/drivers/staging/wfx/hif_tx.c index ea2582714bb9..236f9d62e3a9 100644 --- a/drivers/staging/wfx/hif_tx.c +++ b/drivers/staging/wfx/hif_tx.c @@ -169,8 +169,7 @@ int wfx_hif_reset(struct wfx_vif *wvif, bool reset_stat) return ret; } -int wfx_hif_read_mib(struct wfx_dev *wdev, int vif_id, u16 mib_id, - void *val, size_t val_len) +int wfx_hif_read_mib(struct wfx_dev *wdev, int vif_id, u16 mib_id, void *val, size_t val_len) { int ret; struct wfx_hif_msg *hif; diff --git a/drivers/staging/wfx/hif_tx_mib.c b/drivers/staging/wfx/hif_tx_mib.c index 1c57dd2b697c..df1bcb1e2c02 100644 --- a/drivers/staging/wfx/hif_tx_mib.c +++ b/drivers/staging/wfx/hif_tx_mib.c @@ -84,8 +84,7 @@ int wfx_hif_set_macaddr(struct wfx_vif *wvif, u8 *mac) &arg, sizeof(arg)); } -int wfx_hif_set_rx_filter(struct wfx_vif *wvif, - bool filter_bssid, bool filter_prbreq) +int wfx_hif_set_rx_filter(struct wfx_vif *wvif, bool filter_bssid, bool filter_prbreq) { struct wfx_hif_mib_rx_filter arg = { }; diff --git a/drivers/staging/wfx/hwio.c b/drivers/staging/wfx/hwio.c index c15810bdaecb..3f9750b470be 100644 --- a/drivers/staging/wfx/hwio.c +++ b/drivers/staging/wfx/hwio.c @@ -71,8 +71,7 @@ static int wfx_write32_locked(struct wfx_dev *wdev, int reg, u32 val) return ret; } -static int wfx_write32_bits_locked(struct wfx_dev *wdev, - int reg, u32 mask, u32 val) +static int wfx_write32_bits_locked(struct wfx_dev *wdev, int reg, u32 mask, u32 val) { int ret; u32 val_r, val_w; @@ -94,8 +93,7 @@ static int wfx_write32_bits_locked(struct wfx_dev *wdev, return ret; } -static int wfx_indirect_read(struct wfx_dev *wdev, int reg, u32 addr, - void *buf, size_t len) +static int wfx_indirect_read(struct wfx_dev *wdev, int reg, u32 addr, void *buf, size_t len) { int ret; int i; @@ -199,8 +197,7 @@ static int wfx_indirect_read32_locked(struct wfx_dev *wdev, int reg, u32 addr, u return ret; } -static int wfx_indirect_write32_locked(struct wfx_dev *wdev, int reg, - u32 addr, u32 val) +static int wfx_indirect_write32_locked(struct wfx_dev *wdev, int reg, u32 addr, u32 val) { int ret; __le32 *tmp = kmalloc(sizeof(u32), GFP_KERNEL); diff --git a/drivers/staging/wfx/sta.c b/drivers/staging/wfx/sta.c index ba53e4d70c4f..28474614a8e5 100644 --- a/drivers/staging/wfx/sta.c +++ b/drivers/staging/wfx/sta.c @@ -432,8 +432,7 @@ static void wfx_join(struct wfx_vif *wvif) wfx_tx_unlock(wvif->wdev); } -static void wfx_join_finalize(struct wfx_vif *wvif, - struct ieee80211_bss_conf *info) +static void wfx_join_finalize(struct wfx_vif *wvif, struct ieee80211_bss_conf *info) { struct ieee80211_sta *sta = NULL; int ampdu_density = 0; @@ -539,8 +538,8 @@ void wfx_bss_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif, wfx_enable_beacon(wvif, info->enable_beacon); if (changed & BSS_CHANGED_KEEP_ALIVE) - wfx_hif_keep_alive_period(wvif, info->max_idle_period * - USEC_PER_TU / USEC_PER_MSEC); + wfx_hif_keep_alive_period(wvif, + info->max_idle_period * USEC_PER_TU / USEC_PER_MSEC); if (changed & BSS_CHANGED_ERP_CTS_PROT) wfx_hif_erp_use_protection(wvif, info->use_cts_prot); diff --git a/drivers/staging/wfx/sta.h b/drivers/staging/wfx/sta.h index 082329d7bbcd..c69b2227e9ac 100644 --- a/drivers/staging/wfx/sta.h +++ b/drivers/staging/wfx/sta.h @@ -46,8 +46,7 @@ int wfx_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif, struct ieee80211_ampdu_params *params); int wfx_add_chanctx(struct ieee80211_hw *hw, struct ieee80211_chanctx_conf *conf); void wfx_remove_chanctx(struct ieee80211_hw *hw, struct ieee80211_chanctx_conf *conf); -void wfx_change_chanctx(struct ieee80211_hw *hw, struct ieee80211_chanctx_conf *conf, - u32 changed); +void wfx_change_chanctx(struct ieee80211_hw *hw, struct ieee80211_chanctx_conf *conf, u32 changed); int wfx_assign_vif_chanctx(struct ieee80211_hw *hw, struct ieee80211_vif *vif, struct ieee80211_chanctx_conf *conf); void wfx_unassign_vif_chanctx(struct ieee80211_hw *hw, struct ieee80211_vif *vif, -- 2.34.1