lkml.org 
[lkml]   [2015]   [May]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v4 33/35] staging: rtl8192e: Fix trivial LONG_LINE errors
    Date
    Reindent lines to make checkpatch happy.

    Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
    ---
    drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 83 +++++++++++++++++++-----------
    drivers/staging/rtl8192e/rtllib_rx.c | 24 +++++----
    2 files changed, 67 insertions(+), 40 deletions(-)

    diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
    index a921857..d480229 100644
    --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
    +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
    @@ -403,16 +403,16 @@ static void dm_check_rate_adaptive(struct net_device *dev)
    ((bshort_gi_enabled) ? BIT31 : 0);

    if (pra->ratr_state == DM_RATR_STA_HIGH) {
    - HighRSSIThreshForRA = pra->high2low_rssi_thresh_for_ra;
    - LowRSSIThreshForRA = (priv->CurrentChannelBW != HT_CHANNEL_WIDTH_20) ?
    + HighRSSIThreshForRA = pra->high2low_rssi_thresh_for_ra;
    + LowRSSIThreshForRA = (priv->CurrentChannelBW != HT_CHANNEL_WIDTH_20) ?
    (pra->low_rssi_thresh_for_ra40M) : (pra->low_rssi_thresh_for_ra20M);
    } else if (pra->ratr_state == DM_RATR_STA_LOW) {
    - HighRSSIThreshForRA = pra->high_rssi_thresh_for_ra;
    - LowRSSIThreshForRA = (priv->CurrentChannelBW != HT_CHANNEL_WIDTH_20) ?
    + HighRSSIThreshForRA = pra->high_rssi_thresh_for_ra;
    + LowRSSIThreshForRA = (priv->CurrentChannelBW != HT_CHANNEL_WIDTH_20) ?
    (pra->low2high_rssi_thresh_for_ra40M) : (pra->low2high_rssi_thresh_for_ra20M);
    } else {
    - HighRSSIThreshForRA = pra->high_rssi_thresh_for_ra;
    - LowRSSIThreshForRA = (priv->CurrentChannelBW != HT_CHANNEL_WIDTH_20) ?
    + HighRSSIThreshForRA = pra->high_rssi_thresh_for_ra;
    + LowRSSIThreshForRA = (priv->CurrentChannelBW != HT_CHANNEL_WIDTH_20) ?
    (pra->low_rssi_thresh_for_ra40M) : (pra->low_rssi_thresh_for_ra20M);
    }

    @@ -749,7 +749,8 @@ static void dm_TXPowerTrackingCallback_TSSI(struct net_device *dev)
    "Avg_TSSI_Meas_from_driver = %d\n",
    Avg_TSSI_Meas_from_driver);
    TSSI_13dBm = priv->TSSI_13dBm;
    - RT_TRACE(COMP_POWER_TRACKING, "TSSI_13dBm = %d\n", TSSI_13dBm);
    + RT_TRACE(COMP_POWER_TRACKING, "TSSI_13dBm = %d\n",
    + TSSI_13dBm);

    if (Avg_TSSI_Meas_from_driver > TSSI_13dBm)
    delta = Avg_TSSI_Meas_from_driver - TSSI_13dBm;
    @@ -828,11 +829,13 @@ static void dm_TXPowerTrackingCallback_TSSI(struct net_device *dev)
    "priv->CCKPresentAttentuation = %d\n",
    priv->CCKPresentAttentuation);

    - if (priv->CCKPresentAttentuation_difference <= -12 || priv->CCKPresentAttentuation_difference >= 24) {
    + if (priv->CCKPresentAttentuation_difference <= -12 ||
    + priv->CCKPresentAttentuation_difference >= 24) {
    priv->rtllib->bdynamic_txpower_enable = true;
    write_nic_byte(dev, Pw_Track_Flag, 0);
    write_nic_byte(dev, FW_Busy_Flag, 0);
    - RT_TRACE(COMP_POWER_TRACKING, "tx power track--->limited\n");
    + RT_TRACE(COMP_POWER_TRACKING,
    + "tx power track--->limited\n");
    return;
    }

    @@ -1233,18 +1236,28 @@ static void dm_bb_initialgain_restore(struct net_device *dev)
    return;

    rtl8192_setBBreg(dev, UFWP, bMaskByte1, 0x8);
    - rtl8192_setBBreg(dev, rOFDM0_XAAGCCore1, bit_mask, (u32)priv->initgain_backup.xaagccore1);
    - rtl8192_setBBreg(dev, rOFDM0_XBAGCCore1, bit_mask, (u32)priv->initgain_backup.xbagccore1);
    - rtl8192_setBBreg(dev, rOFDM0_XCAGCCore1, bit_mask, (u32)priv->initgain_backup.xcagccore1);
    - rtl8192_setBBreg(dev, rOFDM0_XDAGCCore1, bit_mask, (u32)priv->initgain_backup.xdagccore1);
    + rtl8192_setBBreg(dev, rOFDM0_XAAGCCore1, bit_mask,
    + (u32)priv->initgain_backup.xaagccore1);
    + rtl8192_setBBreg(dev, rOFDM0_XBAGCCore1, bit_mask,
    + (u32)priv->initgain_backup.xbagccore1);
    + rtl8192_setBBreg(dev, rOFDM0_XCAGCCore1, bit_mask,
    + (u32)priv->initgain_backup.xcagccore1);
    + rtl8192_setBBreg(dev, rOFDM0_XDAGCCore1, bit_mask,
    + (u32)priv->initgain_backup.xdagccore1);
    bit_mask = bMaskByte2;
    - rtl8192_setBBreg(dev, rCCK0_CCA, bit_mask, (u32)priv->initgain_backup.cca);
    -
    - RT_TRACE(COMP_DIG, "dm_BBInitialGainRestore 0xc50 is %x\n", priv->initgain_backup.xaagccore1);
    - RT_TRACE(COMP_DIG, "dm_BBInitialGainRestore 0xc58 is %x\n", priv->initgain_backup.xbagccore1);
    - RT_TRACE(COMP_DIG, "dm_BBInitialGainRestore 0xc60 is %x\n", priv->initgain_backup.xcagccore1);
    - RT_TRACE(COMP_DIG, "dm_BBInitialGainRestore 0xc68 is %x\n", priv->initgain_backup.xdagccore1);
    - RT_TRACE(COMP_DIG, "dm_BBInitialGainRestore 0xa0a is %x\n", priv->initgain_backup.cca);
    + rtl8192_setBBreg(dev, rCCK0_CCA, bit_mask,
    + (u32)priv->initgain_backup.cca);
    +
    + RT_TRACE(COMP_DIG, "dm_BBInitialGainRestore 0xc50 is %x\n",
    + priv->initgain_backup.xaagccore1);
    + RT_TRACE(COMP_DIG, "dm_BBInitialGainRestore 0xc58 is %x\n",
    + priv->initgain_backup.xbagccore1);
    + RT_TRACE(COMP_DIG, "dm_BBInitialGainRestore 0xc60 is %x\n",
    + priv->initgain_backup.xcagccore1);
    + RT_TRACE(COMP_DIG, "dm_BBInitialGainRestore 0xc68 is %x\n",
    + priv->initgain_backup.xdagccore1);
    + RT_TRACE(COMP_DIG, "dm_BBInitialGainRestore 0xa0a is %x\n",
    + priv->initgain_backup.cca);
    rtl8192_setBBreg(dev, UFWP, bMaskByte1, 0x1);

    }
    @@ -1277,11 +1290,16 @@ static void dm_bb_initialgain_backup(struct net_device *dev)
    bit_mask = bMaskByte2;
    priv->initgain_backup.cca = (u8)rtl8192_QueryBBReg(dev, rCCK0_CCA, bit_mask);

    - RT_TRACE(COMP_DIG, "BBInitialGainBackup 0xc50 is %x\n", priv->initgain_backup.xaagccore1);
    - RT_TRACE(COMP_DIG, "BBInitialGainBackup 0xc58 is %x\n", priv->initgain_backup.xbagccore1);
    - RT_TRACE(COMP_DIG, "BBInitialGainBackup 0xc60 is %x\n", priv->initgain_backup.xcagccore1);
    - RT_TRACE(COMP_DIG, "BBInitialGainBackup 0xc68 is %x\n", priv->initgain_backup.xdagccore1);
    - RT_TRACE(COMP_DIG, "BBInitialGainBackup 0xa0a is %x\n", priv->initgain_backup.cca);
    + RT_TRACE(COMP_DIG, "BBInitialGainBackup 0xc50 is %x\n",
    + priv->initgain_backup.xaagccore1);
    + RT_TRACE(COMP_DIG, "BBInitialGainBackup 0xc58 is %x\n",
    + priv->initgain_backup.xbagccore1);
    + RT_TRACE(COMP_DIG, "BBInitialGainBackup 0xc60 is %x\n",
    + priv->initgain_backup.xcagccore1);
    + RT_TRACE(COMP_DIG, "BBInitialGainBackup 0xc68 is %x\n",
    + priv->initgain_backup.xdagccore1);
    + RT_TRACE(COMP_DIG, "BBInitialGainBackup 0xa0a is %x\n",
    + priv->initgain_backup.cca);

    }

    @@ -1798,10 +1816,12 @@ static void dm_check_edca_turbo(struct net_device *dev)
    if (!priv->bis_cur_rdlstate ||
    !priv->bcurrent_turbo_EDCA) {
    if (priv->rtllib->mode == WIRELESS_MODE_G)
    - write_nic_dword(dev, EDCAPARA_BE,
    + write_nic_dword(dev,
    + EDCAPARA_BE,
    edca_setting_DL_GMode[pHTInfo->IOTPeer]);
    else
    - write_nic_dword(dev, EDCAPARA_BE,
    + write_nic_dword(dev,
    + EDCAPARA_BE,
    edca_setting_DL[pHTInfo->IOTPeer]);
    priv->bis_cur_rdlstate = true;
    }
    @@ -1809,12 +1829,15 @@ static void dm_check_edca_turbo(struct net_device *dev)
    priv->bcurrent_turbo_EDCA = true;
    } else {
    if (curRxOkCnt > 4*curTxOkCnt) {
    - if (!priv->bis_cur_rdlstate || !priv->bcurrent_turbo_EDCA) {
    + if (!priv->bis_cur_rdlstate ||
    + !priv->bcurrent_turbo_EDCA) {
    if (priv->rtllib->mode == WIRELESS_MODE_G)
    - write_nic_dword(dev, EDCAPARA_BE,
    + write_nic_dword(dev,
    + EDCAPARA_BE,
    edca_setting_DL_GMode[pHTInfo->IOTPeer]);
    else
    - write_nic_dword(dev, EDCAPARA_BE,
    + write_nic_dword(dev,
    + EDCAPARA_BE,
    edca_setting_DL[pHTInfo->IOTPeer]);
    priv->bis_cur_rdlstate = true;
    }
    diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192e/rtllib_rx.c
    index 3f28caa..995d9aa 100644
    --- a/drivers/staging/rtl8192e/rtllib_rx.c
    +++ b/drivers/staging/rtl8192e/rtllib_rx.c
    @@ -1260,14 +1260,16 @@ static void rtllib_rx_indicate_pkt_legacy(struct rtllib_device *ieee,
    struct sk_buff *sub_skb = rxb->subframes[i];

    if (sub_skb) {
    - /* convert hdr + possible LLC headers into Ethernet header */
    + /* convert hdr + possible LLC headers
    + * into Ethernet header
    + */
    ethertype = (sub_skb->data[6] << 8) | sub_skb->data[7];
    if (sub_skb->len >= 8 &&
    ((memcmp(sub_skb->data, rfc1042_header, SNAP_SIZE) == 0 &&
    ethertype != ETH_P_AARP && ethertype != ETH_P_IPX) ||
    memcmp(sub_skb->data, bridge_tunnel_header, SNAP_SIZE) == 0)) {
    - /* remove RFC1042 or Bridge-Tunnel encapsulation and
    - * replace EtherType
    + /* remove RFC1042 or Bridge-Tunnel encapsulation
    + * and replace EtherType
    */
    skb_pull(sub_skb, SNAP_SIZE);
    ether_addr_copy(skb_push(sub_skb, ETH_ALEN),
    @@ -1276,7 +1278,9 @@ static void rtllib_rx_indicate_pkt_legacy(struct rtllib_device *ieee,
    dst);
    } else {
    u16 len;
    - /* Leave Ethernet header part of hdr and full payload */
    + /* Leave Ethernet header part of hdr
    + * and full payload
    + */
    len = sub_skb->len;
    memcpy(skb_push(sub_skb, 2), &len, 2);
    ether_addr_copy(skb_push(sub_skb, ETH_ALEN),
    @@ -1297,7 +1301,8 @@ static void rtllib_rx_indicate_pkt_legacy(struct rtllib_device *ieee,
    sub_skb->dev = dev;
    sub_skb->dev->stats.rx_packets++;
    sub_skb->dev->stats.rx_bytes += sub_skb->len;
    - sub_skb->ip_summed = CHECKSUM_NONE; /* 802.11 crc not sufficient */
    + /* 802.11 crc not sufficient */
    + sub_skb->ip_summed = CHECKSUM_NONE;
    netif_rx(sub_skb);
    }
    }
    @@ -1839,11 +1844,10 @@ static void rtllib_parse_mife_generic(struct rtllib_device *ieee,

    if (*tmp_htcap_len == 0) {
    if (info_element->len >= 4 &&
    - info_element->data[0] == 0x00 &&
    - info_element->data[1] == 0x90 &&
    - info_element->data[2] == 0x4c &&
    - info_element->data[3] == 0x033) {
    -
    + info_element->data[0] == 0x00 &&
    + info_element->data[1] == 0x90 &&
    + info_element->data[2] == 0x4c &&
    + info_element->data[3] == 0x033) {
    *tmp_htcap_len = min_t(u8, info_element->len,
    MAX_IE_LEN);
    if (*tmp_htcap_len != 0) {
    --
    1.8.4.1


    \
     
     \ /
      Last update: 2015-05-21 18:41    [W:3.599 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site