Commit 1dc3d53e authored by Jules Irenge's avatar Jules Irenge Committed by Greg Kroah-Hartman

staging: wfx: fix warning of line over 80 characters

Fix warning of lines over 80 characters.
Issue detected by checkpatch tool.
Signed-off-by: default avatarJules Irenge <jbi.octave@gmail.com>
Link: https://lore.kernel.org/r/20191019140719.2542-3-jbi.octave@gmail.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bc9496e5
...@@ -32,7 +32,8 @@ static void device_wakeup(struct wfx_dev *wdev) ...@@ -32,7 +32,8 @@ static void device_wakeup(struct wfx_dev *wdev)
// completion without consume it (a kind of // completion without consume it (a kind of
// wait_for_completion_done_timeout()). So we have to emulate // wait_for_completion_done_timeout()). So we have to emulate
// it. // it.
if (wait_for_completion_timeout(&wdev->hif.ctrl_ready, msecs_to_jiffies(2) + 1)) if (wait_for_completion_timeout(&wdev->hif.ctrl_ready,
msecs_to_jiffies(2) + 1))
complete(&wdev->hif.ctrl_ready); complete(&wdev->hif.ctrl_ready);
else else
dev_err(wdev->dev, "timeout while wake up chip\n"); dev_err(wdev->dev, "timeout while wake up chip\n");
...@@ -179,8 +180,9 @@ static void tx_helper(struct wfx_dev *wdev, struct hif_msg *hif) ...@@ -179,8 +180,9 @@ static void tx_helper(struct wfx_dev *wdev, struct hif_msg *hif)
wdev->hif.tx_seqnum = (wdev->hif.tx_seqnum + 1) % (HIF_COUNTER_MAX + 1); wdev->hif.tx_seqnum = (wdev->hif.tx_seqnum + 1) % (HIF_COUNTER_MAX + 1);
if (wfx_is_secure_command(wdev, hif->id)) { if (wfx_is_secure_command(wdev, hif->id)) {
len = round_up(len - sizeof(hif->len), 16) + sizeof(hif->len) len = round_up(len - sizeof(hif->len), 16) + sizeof(hif->len) +
+ sizeof(struct hif_sl_msg_hdr) + sizeof(struct hif_sl_tag); sizeof(struct hif_sl_msg_hdr) +
sizeof(struct hif_sl_tag);
// AES support encryption in-place. However, mac80211 access to // AES support encryption in-place. However, mac80211 access to
// 802.11 header after frame was sent (to get MAC addresses). // 802.11 header after frame was sent (to get MAC addresses).
// So, keep origin buffer clear. // So, keep origin buffer clear.
...@@ -241,7 +243,8 @@ static void ack_sdio_data(struct wfx_dev *wdev) ...@@ -241,7 +243,8 @@ static void ack_sdio_data(struct wfx_dev *wdev)
config_reg_read(wdev, &cfg_reg); config_reg_read(wdev, &cfg_reg);
if (cfg_reg & 0xFF) { if (cfg_reg & 0xFF) {
dev_warn(wdev->dev, "chip reports errors: %02x\n", cfg_reg & 0xFF); dev_warn(wdev->dev, "chip reports errors: %02x\n",
cfg_reg & 0xFF);
config_reg_write_bits(wdev, 0xFF, 0x00); config_reg_write_bits(wdev, 0xFF, 0x00);
} }
} }
...@@ -268,11 +271,13 @@ static void bh_work(struct work_struct *work) ...@@ -268,11 +271,13 @@ static void bh_work(struct work_struct *work)
if (last_op_is_rx) if (last_op_is_rx)
ack_sdio_data(wdev); ack_sdio_data(wdev);
if (!wdev->hif.tx_buffers_used && !work_pending(work) && !atomic_read(&wdev->scan_in_progress)) { if (!wdev->hif.tx_buffers_used && !work_pending(work) &&
!atomic_read(&wdev->scan_in_progress)) {
device_release(wdev); device_release(wdev);
release_chip = true; release_chip = true;
} }
_trace_bh_stats(stats_ind, stats_req, stats_cnf, wdev->hif.tx_buffers_used, release_chip); _trace_bh_stats(stats_ind, stats_req, stats_cnf,
wdev->hif.tx_buffers_used, release_chip);
} }
/* /*
......
...@@ -21,8 +21,10 @@ ...@@ -21,8 +21,10 @@
#define WFX_REG_FRAME_OUT 0x7 #define WFX_REG_FRAME_OUT 0x7
struct hwbus_ops { struct hwbus_ops {
int (*copy_from_io)(void *bus_priv, unsigned int addr, void *dst, size_t count); int (*copy_from_io)(void *bus_priv, unsigned int addr,
int (*copy_to_io)(void *bus_priv, unsigned int addr, const void *src, size_t count); void *dst, size_t count);
int (*copy_to_io)(void *bus_priv, unsigned int addr,
const void *src, size_t count);
void (*lock)(void *bus_priv); void (*lock)(void *bus_priv);
void (*unlock)(void *bus_priv); void (*unlock)(void *bus_priv);
size_t (*align_size)(void *bus_priv, size_t size); size_t (*align_size)(void *bus_priv, size_t size);
......
...@@ -180,7 +180,8 @@ static int wfx_sdio_probe(struct sdio_func *func, ...@@ -180,7 +180,8 @@ static int wfx_sdio_probe(struct sdio_func *func,
} }
bus->of_irq = irq_of_parse_and_map(np, 0); bus->of_irq = irq_of_parse_and_map(np, 0);
} else { } else {
dev_warn(&func->dev, "device is not declared in DT, features will be limited\n"); dev_warn(&func->dev,
"device is not declared in DT, features will be limited\n");
// FIXME: ignore VID/PID and only rely on device tree // FIXME: ignore VID/PID and only rely on device tree
// return -ENODEV; // return -ENODEV;
} }
......
...@@ -178,11 +178,14 @@ static int wfx_spi_probe(struct spi_device *func) ...@@ -178,11 +178,14 @@ static int wfx_spi_probe(struct spi_device *func)
return ret; return ret;
// Trace below is also displayed by spi_setup() if compiled with DEBUG // Trace below is also displayed by spi_setup() if compiled with DEBUG
dev_dbg(&func->dev, "SPI params: CS=%d, mode=%d bits/word=%d speed=%d\n", dev_dbg(&func->dev, "SPI params: CS=%d, mode=%d bits/word=%d speed=%d\n",
func->chip_select, func->mode, func->bits_per_word, func->max_speed_hz); func->chip_select, func->mode, func->bits_per_word,
func->max_speed_hz);
if (func->bits_per_word != 16 && func->bits_per_word != 8) if (func->bits_per_word != 16 && func->bits_per_word != 8)
dev_warn(&func->dev, "unusual bits/word value: %d\n", func->bits_per_word); dev_warn(&func->dev, "unusual bits/word value: %d\n",
func->bits_per_word);
if (func->max_speed_hz > 49000000) if (func->max_speed_hz > 49000000)
dev_warn(&func->dev, "%dHz is a very high speed\n", func->max_speed_hz); dev_warn(&func->dev, "%dHz is a very high speed\n",
func->max_speed_hz);
bus = devm_kzalloc(&func->dev, sizeof(*bus), GFP_KERNEL); bus = devm_kzalloc(&func->dev, sizeof(*bus), GFP_KERNEL);
if (!bus) if (!bus)
......
...@@ -98,7 +98,8 @@ static int wfx_drop_encrypt_data(struct wfx_dev *wdev, struct hif_ind_rx *arg, s ...@@ -98,7 +98,8 @@ static int wfx_drop_encrypt_data(struct wfx_dev *wdev, struct hif_ind_rx *arg, s
} }
void wfx_rx_cb(struct wfx_vif *wvif, struct hif_ind_rx *arg, struct sk_buff *skb) void wfx_rx_cb(struct wfx_vif *wvif, struct hif_ind_rx *arg,
struct sk_buff *skb)
{ {
int link_id = arg->rx_flags.peer_sta_id; int link_id = arg->rx_flags.peer_sta_id;
struct ieee80211_rx_status *hdr = IEEE80211_SKB_RXCB(skb); struct ieee80211_rx_status *hdr = IEEE80211_SKB_RXCB(skb);
...@@ -118,7 +119,8 @@ void wfx_rx_cb(struct wfx_vif *wvif, struct hif_ind_rx *arg, struct sk_buff *skb ...@@ -118,7 +119,8 @@ void wfx_rx_cb(struct wfx_vif *wvif, struct hif_ind_rx *arg, struct sk_buff *skb
if (link_id && link_id <= WFX_MAX_STA_IN_AP_MODE) { if (link_id && link_id <= WFX_MAX_STA_IN_AP_MODE) {
entry = &wvif->link_id_db[link_id - 1]; entry = &wvif->link_id_db[link_id - 1];
entry->timestamp = jiffies; entry->timestamp = jiffies;
if (entry->status == WFX_LINK_SOFT && ieee80211_is_data(frame->frame_control)) if (entry->status == WFX_LINK_SOFT &&
ieee80211_is_data(frame->frame_control))
early_data = true; early_data = true;
} }
...@@ -137,7 +139,8 @@ void wfx_rx_cb(struct wfx_vif *wvif, struct hif_ind_rx *arg, struct sk_buff *skb ...@@ -137,7 +139,8 @@ void wfx_rx_cb(struct wfx_vif *wvif, struct hif_ind_rx *arg, struct sk_buff *skb
goto drop; goto drop;
hdr->band = NL80211_BAND_2GHZ; hdr->band = NL80211_BAND_2GHZ;
hdr->freq = ieee80211_channel_to_frequency(arg->channel_number, hdr->band); hdr->freq = ieee80211_channel_to_frequency(arg->channel_number,
hdr->band);
if (arg->rxed_rate >= 14) { if (arg->rxed_rate >= 14) {
hdr->encoding = RX_ENC_HT; hdr->encoding = RX_ENC_HT;
...@@ -166,7 +169,8 @@ void wfx_rx_cb(struct wfx_vif *wvif, struct hif_ind_rx *arg, struct sk_buff *skb ...@@ -166,7 +169,8 @@ void wfx_rx_cb(struct wfx_vif *wvif, struct hif_ind_rx *arg, struct sk_buff *skb
goto drop; goto drop;
if (ieee80211_is_beacon(frame->frame_control) if (ieee80211_is_beacon(frame->frame_control)
&& !arg->status && wvif->vif && !arg->status && wvif->vif
&& ether_addr_equal(ieee80211_get_SA(frame), wvif->vif->bss_conf.bssid)) { && ether_addr_equal(ieee80211_get_SA(frame),
wvif->vif->bss_conf.bssid)) {
const u8 *tim_ie; const u8 *tim_ie;
u8 *ies = mgmt->u.beacon.variable; u8 *ies = mgmt->u.beacon.variable;
size_t ies_len = skb->len - (ies - skb->data); size_t ies_len = skb->len - (ies - skb->data);
...@@ -183,7 +187,8 @@ void wfx_rx_cb(struct wfx_vif *wvif, struct hif_ind_rx *arg, struct sk_buff *skb ...@@ -183,7 +187,8 @@ void wfx_rx_cb(struct wfx_vif *wvif, struct hif_ind_rx *arg, struct sk_buff *skb
/* Disable beacon filter once we're associated... */ /* Disable beacon filter once we're associated... */
if (wvif->disable_beacon_filter && if (wvif->disable_beacon_filter &&
(wvif->vif->bss_conf.assoc || wvif->vif->bss_conf.ibss_joined)) { (wvif->vif->bss_conf.assoc ||
wvif->vif->bss_conf.ibss_joined)) {
wvif->disable_beacon_filter = false; wvif->disable_beacon_filter = false;
schedule_work(&wvif->update_filtering_work); schedule_work(&wvif->update_filtering_work);
} }
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment