Message ID | 20201209135550.2004-1-zhengyongjun3@huawei.com (mailing list archive) |
---|---|
State | Awaiting Upstream |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | [wireless,-next] cw1200: txrx: convert comma to semicolon | expand |
Context | Check | Description |
---|---|---|
netdev/tree_selection | success | Not a local patch |
Zheng Yongjun <zhengyongjun3@huawei.com> wrote: > Replace a comma between expression statements by a semicolon. > > Signed-off-by: Zheng Yongjun <zhengyongjun3@huawei.com> Patch applied to wireless-drivers-next.git, thanks. c42d492c672a cw1200: txrx: convert comma to semicolon
On Thu, 2020-12-10 at 18:50 +0000, Kalle Valo wrote: > Zheng Yongjun <zhengyongjun3@huawei.com> wrote: > > > Replace a comma between expression statements by a semicolon. > > > > Signed-off-by: Zheng Yongjun <zhengyongjun3@huawei.com> > > Patch applied to wireless-drivers-next.git, thanks. > > c42d492c672a cw1200: txrx: convert comma to semicolon > There's are several of these in drivers/net/wireless: Using a cocci script posted by Julia: --- diff -u -p a/mediatek/mt76/mt7915/mcu.c b/mediatek/mt76/mt7915/mcu.c --- a/mediatek/mt76/mt7915/mcu.c +++ b/mediatek/mt76/mt7915/mcu.c @@ -1148,7 +1148,7 @@ mt7915_mcu_sta_ba_tlv(struct sk_buff *sk tlv = mt7915_mcu_add_tlv(skb, STA_REC_BA, sizeof(*ba)); ba = (struct sta_rec_ba *)tlv; - ba->ba_type = tx ? MT_BA_TYPE_ORIGINATOR : MT_BA_TYPE_RECIPIENT, + ba->ba_type = tx ? MT_BA_TYPE_ORIGINATOR : MT_BA_TYPE_RECIPIENT; ba->winsize = cpu_to_le16(params->buf_size); ba->ssn = cpu_to_le16(params->ssn); ba->ba_en = enable << params->tid; @@ -1676,7 +1676,7 @@ mt7915_mcu_wtbl_ht_tlv(struct sk_buff *s tlv = mt7915_mcu_add_nested_tlv(skb, WTBL_VHT, sizeof(*vht), wtbl_tlv, sta_wtbl); vht = (struct wtbl_vht *)tlv; - vht->ldpc = sta->vht_cap.cap & IEEE80211_VHT_CAP_RXLDPC, + vht->ldpc = sta->vht_cap.cap & IEEE80211_VHT_CAP_RXLDPC; vht->vht = true; af = FIELD_GET(IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK, @@ -2858,7 +2858,7 @@ int mt7915_mcu_init(struct mt7915_dev *d }; int ret; - dev->mt76.mcu_ops = &mt7915_mcu_ops, + dev->mt76.mcu_ops = &mt7915_mcu_ops; ret = mt7915_driver_own(dev); if (ret) diff -u -p a/mediatek/mt76/mt7615/usb_mcu.c b/mediatek/mt76/mt7615/usb_mcu.c --- a/mediatek/mt76/mt7615/usb_mcu.c +++ b/mediatek/mt76/mt7615/usb_mcu.c @@ -61,7 +61,7 @@ int mt7663u_mcu_init(struct mt7615_dev * }; int ret; - dev->mt76.mcu_ops = &mt7663u_mcu_ops, + dev->mt76.mcu_ops = &mt7663u_mcu_ops; /* usb does not support runtime-pm */ clear_bit(MT76_STATE_PM, &dev->mphy.state); diff -u -p a/mediatek/mt76/mt7615/mcu.c b/mediatek/mt76/mt7615/mcu.c --- a/mediatek/mt76/mt7615/mcu.c +++ b/mediatek/mt76/mt7615/mcu.c @@ -982,7 +982,7 @@ mt7615_mcu_sta_ba_tlv(struct sk_buff *sk tlv = mt7615_mcu_add_tlv(skb, STA_REC_BA, sizeof(*ba)); ba = (struct sta_rec_ba *)tlv; - ba->ba_type = tx ? MT_BA_TYPE_ORIGINATOR : MT_BA_TYPE_RECIPIENT, + ba->ba_type = tx ? MT_BA_TYPE_ORIGINATOR : MT_BA_TYPE_RECIPIENT; ba->winsize = cpu_to_le16(params->buf_size); ba->ssn = cpu_to_le16(params->ssn); ba->ba_en = enable << params->tid; @@ -2472,7 +2472,7 @@ int mt7615_mcu_init(struct mt7615_dev *d }; int ret; - dev->mt76.mcu_ops = &mt7615_mcu_ops, + dev->mt76.mcu_ops = &mt7615_mcu_ops; ret = mt7615_mcu_drv_pmctrl(dev); if (ret) diff -u -p a/mediatek/mt76/mt7615/sdio_mcu.c b/mediatek/mt76/mt7615/sdio_mcu.c --- a/mediatek/mt76/mt7615/sdio_mcu.c +++ b/mediatek/mt76/mt7615/sdio_mcu.c @@ -139,7 +139,7 @@ int mt7663s_mcu_init(struct mt7615_dev * if (ret) return ret; - dev->mt76.mcu_ops = &mt7663s_mcu_ops, + dev->mt76.mcu_ops = &mt7663s_mcu_ops; ret = mt76_get_field(dev, MT_CONN_ON_MISC, MT_TOP_MISC2_FW_N9_RDY); if (ret) { diff -u -p a/st/cw1200/txrx.c b/st/cw1200/txrx.c --- a/st/cw1200/txrx.c +++ b/st/cw1200/txrx.c @@ -650,7 +650,7 @@ cw1200_tx_h_rate_policy(struct cw1200_co wsm->flags |= t->txpriv.rate_id << 4; t->rate = cw1200_get_tx_rate(priv, - &t->tx_info->control.rates[0]), + &t->tx_info->control.rates[0]); wsm->max_tx_rate = t->rate->hw_value; if (t->rate->flags & IEEE80211_TX_RC_MCS) { if (cw1200_ht_greenfield(&priv->ht_info)) diff -u -p a/intersil/prism54/islpci_dev.c b/intersil/prism54/islpci_dev.c --- a/intersil/prism54/islpci_dev.c +++ b/intersil/prism54/islpci_dev.c @@ -121,7 +121,7 @@ isl_upload_firmware(islpci_private *priv while (_fw_len > 0) { /* use non-swapping writel() */ __raw_writel(*fw_ptr, dev_fw_ptr); - fw_ptr++, dev_fw_ptr++; + fw_ptr++; dev_fw_ptr++; _fw_len -= 4; } diff -u -p a/intel/iwlwifi/mvm/debugfs.c b/intel/iwlwifi/mvm/debugfs.c --- a/intel/iwlwifi/mvm/debugfs.c +++ b/intel/iwlwifi/mvm/debugfs.c @@ -1949,7 +1949,7 @@ static ssize_t iwl_dbgfs_mem_write(struc return -EFAULT; } - hcmd.flags = CMD_WANT_SKB | CMD_SEND_IN_RFKILL, + hcmd.flags = CMD_WANT_SKB | CMD_SEND_IN_RFKILL; hcmd.data[0] = (void *)cmd; hcmd.len[0] = cmd_size; diff -u -p a/ralink/rt2x00/rt2800lib.c b/ralink/rt2x00/rt2800lib.c --- a/ralink/rt2x00/rt2800lib.c +++ b/ralink/rt2x00/rt2800lib.c @@ -3487,7 +3487,7 @@ static void rt2800_config_channel_rf55xx rt2800_rfcsr_write(rt2x00dev, 52, 0x0C); rt2800_rfcsr_write(rt2x00dev, 54, 0xF8); if (rf->channel <= 50) { - rt2800_rfcsr_write(rt2x00dev, 55, 0x06), + rt2800_rfcsr_write(rt2x00dev, 55, 0x06); rt2800_rfcsr_write(rt2x00dev, 56, 0xD3); } else if (rf->channel >= 52) { rt2800_rfcsr_write(rt2x00dev, 55, 0x04);
diff --git a/drivers/net/wireless/st/cw1200/txrx.c b/drivers/net/wireless/st/cw1200/txrx.c index 400dd585916b..7de666b90ff5 100644 --- a/drivers/net/wireless/st/cw1200/txrx.c +++ b/drivers/net/wireless/st/cw1200/txrx.c @@ -650,7 +650,7 @@ cw1200_tx_h_rate_policy(struct cw1200_common *priv, wsm->flags |= t->txpriv.rate_id << 4; t->rate = cw1200_get_tx_rate(priv, - &t->tx_info->control.rates[0]), + &t->tx_info->control.rates[0]); wsm->max_tx_rate = t->rate->hw_value; if (t->rate->flags & IEEE80211_TX_RC_MCS) { if (cw1200_ht_greenfield(&priv->ht_info))
Replace a comma between expression statements by a semicolon. Signed-off-by: Zheng Yongjun <zhengyongjun3@huawei.com> --- drivers/net/wireless/st/cw1200/txrx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)