* (no subject) @ 2010-06-10 1:18 Mike Gilks 2010-06-10 1:18 ` [PATCH 1/4] staging: rtl8192u: fix checkpatch.pl issues to line 3100 Fix most problems pointed out by checkpatch.pl in file r8192U_core.c up to line 3100 Mike Gilks 0 siblings, 1 reply; 5+ messages in thread From: Mike Gilks @ 2010-06-10 1:18 UTC (permalink / raw) To: gregkh, mchehab, julia, joe; +Cc: devel, linux-kernel Subject: line length issues in patches In-Reply-To: There are some long lines around line 3200 that I can not get rid of. I think this needs someone smarter than me. Mike ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/4] staging: rtl8192u: fix checkpatch.pl issues to line 3100 Fix most problems pointed out by checkpatch.pl in file r8192U_core.c up to line 3100 2010-06-10 1:18 Mike Gilks @ 2010-06-10 1:18 ` Mike Gilks 2010-06-10 1:18 ` [PATCH 2/4] staging: rtl8192u: fix checkpatch.pl issues to line 3200 Fix most problems pointed out by checkpatch.pl in file r8192U_core.c up to line 3200 Mike Gilks 0 siblings, 1 reply; 5+ messages in thread From: Mike Gilks @ 2010-06-10 1:18 UTC (permalink / raw) To: gregkh, mchehab, julia, joe; +Cc: devel, linux-kernel, Mike Gilks Signed-off-by: Mike Gilks <mike.kernel@gilksonline.com> --- drivers/staging/rtl8192u/r8192U_core.c | 42 ++++++++++++++++---------------- 1 files changed, 21 insertions(+), 21 deletions(-) diff --git a/drivers/staging/rtl8192u/r8192U_core.c b/drivers/staging/rtl8192u/r8192U_core.c index 0f852ad..8b6aacb 100644 --- a/drivers/staging/rtl8192u/r8192U_core.c +++ b/drivers/staging/rtl8192u/r8192U_core.c @@ -3023,43 +3023,40 @@ static void rtl8192_init_priv_variable(struct net_device *dev) * 2005.07.07, by rcnjko. */ RCR_AB | RCR_AM | RCR_APM | /* accept BC/MC/UC */ - /* RCR_AICV | RCR_ACRC32 | accept ICV/CRC error packet */ + /* RCR_AICV | RCR_ACRC32 | accept ICV/CRC error packet */ ((u32)7<<RCR_MXDMA_OFFSET)| /* Max DMA Burst Size per Rx DMA Burst, 7: unlimited. */ (priv->EarlyRxThreshold<<RX_FIFO_THRESHOLD_SHIFT) | /* Rx FIFO Threshold, 7: No Rx threshold. */ - (priv->EarlyRxThreshold == 7 ? RCR_ONLYERLPKT:0); + (priv->EarlyRxThreshold == 7 ? RCR_ONLYERLPKT : 0); priv->AcmControl = 0; priv->pFirmware = kmalloc(sizeof(rt_firmware), GFP_KERNEL); if (priv->pFirmware) - memset(priv->pFirmware, 0, sizeof(rt_firmware)); + memset(priv->pFirmware, 0, sizeof(rt_firmware)); /* rx related queue */ skb_queue_head_init(&priv->rx_queue); skb_queue_head_init(&priv->skb_queue); /* Tx related queue */ - for(i = 0; i < MAX_QUEUE_SIZE; i++) { - skb_queue_head_init(&priv->ieee80211->skb_waitQ [i]); - } - for(i = 0; i < MAX_QUEUE_SIZE; i++) { - skb_queue_head_init(&priv->ieee80211->skb_aggQ [i]); - } - for(i = 0; i < MAX_QUEUE_SIZE; i++) { - skb_queue_head_init(&priv->ieee80211->skb_drv_aggQ [i]); - } + for (i = 0; i < MAX_QUEUE_SIZE; i++) + skb_queue_head_init(&priv->ieee80211->skb_waitQ[i]); + for (i = 0; i < MAX_QUEUE_SIZE; i++) + skb_queue_head_init(&priv->ieee80211->skb_aggQ[i]); + for (i = 0; i < MAX_QUEUE_SIZE; i++) + skb_queue_head_init(&priv->ieee80211->skb_drv_aggQ[i]); priv->rf_set_chan = rtl8192_phy_SwChnl; } /* init lock here */ -static void rtl8192_init_priv_lock(struct r8192_priv* priv) +static void rtl8192_init_priv_lock(struct r8192_priv *priv) { spin_lock_init(&priv->tx_lock); spin_lock_init(&priv->irq_lock); /* added by thomas */ /* spin_lock_init(&priv->rf_lock); */ - sema_init(&priv->wx_sem,1); - sema_init(&priv->rf_sem,1); + sema_init(&priv->wx_sem, 1); + sema_init(&priv->rf_sem, 1); mutex_init(&priv->mutex); } @@ -3068,12 +3065,12 @@ extern void rtl819x_watchdog_wqcallback(struct work_struct *work); void rtl8192_irq_rx_tasklet(struct r8192_priv *priv); /* init tasklet and wait_queue here. only 2.6 above kernel is considered */ #define DRV_NAME "wlan0" -static void rtl8192_init_priv_task(struct net_device* dev) +static void rtl8192_init_priv_task(struct net_device *dev) { struct r8192_priv *priv = ieee80211_priv(dev); #ifdef PF_SYNCTHREAD - priv->priv_wq = create_workqueue(DRV_NAME,0); + priv->priv_wq = create_workqueue(DRV_NAME, 0); #else priv->priv_wq = create_workqueue(DRV_NAME); #endif @@ -3082,13 +3079,16 @@ static void rtl8192_init_priv_task(struct net_device* dev) /* INIT_DELAYED_WORK(&priv->watch_dog_wq, hal_dm_watchdog); */ INIT_DELAYED_WORK(&priv->watch_dog_wq, rtl819x_watchdog_wqcallback); - INIT_DELAYED_WORK(&priv->txpower_tracking_wq, dm_txpower_trackingcallback); + INIT_DELAYED_WORK(&priv->txpower_tracking_wq, + dm_txpower_trackingcallback); /* INIT_DELAYED_WORK(&priv->gpio_change_rf_wq, * dm_gpio_change_rf_callback); */ - INIT_DELAYED_WORK(&priv->rfpath_check_wq, dm_rf_pathcheck_workitemcallback); + INIT_DELAYED_WORK(&priv->rfpath_check_wq, + dm_rf_pathcheck_workitemcallback); INIT_DELAYED_WORK(&priv->update_beacon_wq, rtl8192_update_beacon); - INIT_DELAYED_WORK(&priv->initialgain_operate_wq, InitialGainOperateWorkItemCallBack); + INIT_DELAYED_WORK(&priv->initialgain_operate_wq, + InitialGainOperateWorkItemCallBack); /* INIT_WORK(&priv->SwChnlWorkItem, rtl8192_SwChnl_WorkItem); */ /* INIT_WORK(&priv->SetBWModeWorkItem, rtl8192_SetBWModeWorkItem); */ INIT_WORK(&priv->qos_activate, rtl8192_qos_activate); @@ -3098,7 +3098,7 @@ static void rtl8192_init_priv_task(struct net_device* dev) (unsigned long)priv); } -static void rtl8192_get_eeprom_size(struct net_device* dev) +static void rtl8192_get_eeprom_size(struct net_device *dev) { u16 curCR = 0; struct r8192_priv *priv = ieee80211_priv(dev); -- 1.6.3.3 ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 2/4] staging: rtl8192u: fix checkpatch.pl issues to line 3200 Fix most problems pointed out by checkpatch.pl in file r8192U_core.c up to line 3200 2010-06-10 1:18 ` [PATCH 1/4] staging: rtl8192u: fix checkpatch.pl issues to line 3100 Fix most problems pointed out by checkpatch.pl in file r8192U_core.c up to line 3100 Mike Gilks @ 2010-06-10 1:18 ` Mike Gilks 2010-06-10 1:18 ` [PATCH 3/4] staging: rtl8192u: fix checkpatch.pl issues to line 3400 Fix most problems pointed out by checkpatch.pl in file r8192U_core.c up to line 3400 Starting at line 3299 there are some long lines I cannot get rid of. An actual developer may be reuired Mike Gilks 0 siblings, 1 reply; 5+ messages in thread From: Mike Gilks @ 2010-06-10 1:18 UTC (permalink / raw) To: gregkh, mchehab, julia, joe; +Cc: devel, linux-kernel, Mike Gilks Signed-off-by: Mike Gilks <mike.kernel@gilksonline.com> --- drivers/staging/rtl8192u/r8192U_core.c | 81 +++++++++++++++++--------------- 1 files changed, 43 insertions(+), 38 deletions(-) diff --git a/drivers/staging/rtl8192u/r8192U_core.c b/drivers/staging/rtl8192u/r8192U_core.c index 8b6aacb..f66d66e 100644 --- a/drivers/staging/rtl8192u/r8192U_core.c +++ b/drivers/staging/rtl8192u/r8192U_core.c @@ -3103,23 +3103,26 @@ static void rtl8192_get_eeprom_size(struct net_device *dev) u16 curCR = 0; struct r8192_priv *priv = ieee80211_priv(dev); RT_TRACE(COMP_EPROM, "===========>%s()\n", __func__); - curCR = read_nic_word_E(dev,EPROM_CMD); - RT_TRACE(COMP_EPROM, "read from Reg EPROM_CMD(%x):%x\n", EPROM_CMD, curCR); + curCR = read_nic_word_E(dev, EPROM_CMD); + RT_TRACE(COMP_EPROM, "read from Reg EPROM_CMD(%x):%x\n", + EPROM_CMD, curCR); /* whether need I consider BIT5? */ - priv->epromtype = (curCR & Cmd9346CR_9356SEL) ? EPROM_93c56 : EPROM_93c46; - RT_TRACE(COMP_EPROM, "<===========%s(), epromtype:%d\n", __func__, priv->epromtype); + priv->epromtype = (curCR & Cmd9346CR_9356SEL) ? EPROM_93c56 : + EPROM_93c46; + RT_TRACE(COMP_EPROM, "<===========%s(), epromtype:%d\n", + __func__, priv->epromtype); } /* used to swap endian. as ntohl & htonl are not neccessary to swap endian, * so use this instead. */ -static inline u16 endian_swap(u16* data) +static inline u16 endian_swap(u16 *data) { u16 tmp = *data; *data = (tmp >> 8) | (tmp << 8); return *data; } -static void rtl8192_read_eeprom_info(struct net_device* dev) +static void rtl8192_read_eeprom_info(struct net_device *dev) { u16 wEPROM_ID = 0; u8 bMac_Tmp_Addr[6] = {0x00, 0xe0, 0x4c, 0x00, 0x00, 0x02}; @@ -3130,46 +3133,42 @@ static void rtl8192_read_eeprom_info(struct net_device* dev) wEPROM_ID = eprom_read(dev, 0); /* first read EEPROM ID out; */ RT_TRACE(COMP_EPROM, "EEPROM ID is 0x%x\n", wEPROM_ID); - if (wEPROM_ID != RTL8190_EEPROM_ID) - { - RT_TRACE(COMP_ERR, "EEPROM ID is invalid(is 0x%x(should be 0x%x)\n", wEPROM_ID, RTL8190_EEPROM_ID); - } - else + if (wEPROM_ID != RTL8190_EEPROM_ID) { + RT_TRACE(COMP_ERR, "EEPROM ID is invalid(is 0x%x" + "(should be 0x%x)\n", wEPROM_ID, RTL8190_EEPROM_ID); + } else bLoad_From_EEPOM = true; - if (bLoad_From_EEPOM) - { + if (bLoad_From_EEPOM) { tmpValue = eprom_read(dev, (EEPROM_VID>>1)); priv->eeprom_vid = endian_swap(&tmpValue); priv->eeprom_pid = eprom_read(dev, (EEPROM_PID>>1)); tmpValue = eprom_read(dev, (EEPROM_ChannelPlan>>1)); - priv->eeprom_ChannelPlan =((tmpValue&0xff00)>>8); + priv->eeprom_ChannelPlan = ((tmpValue&0xff00)>>8); priv->btxpowerdata_readfromEEPORM = true; - priv->eeprom_CustomerID = eprom_read(dev, (EEPROM_Customer_ID>>1)) >>8; - } - else - { + priv->eeprom_CustomerID = eprom_read(dev, + (EEPROM_Customer_ID>>1)) >> 8; + } else { priv->eeprom_vid = 0; priv->eeprom_pid = 0; priv->card_8192_version = VERSION_819xU_B; priv->eeprom_ChannelPlan = 0; priv->eeprom_CustomerID = 0; } - RT_TRACE(COMP_EPROM, "vid:0x%4x, pid:0x%4x, CustomID:0x%2x, ChanPlan:0x%x\n", priv->eeprom_vid, priv->eeprom_pid, priv->eeprom_CustomerID, priv->eeprom_ChannelPlan); + RT_TRACE(COMP_EPROM, "vid:0x%4x, pid:0x%4x, CustomID:0x%2x, " + "ChanPlan:0x%x\n", priv->eeprom_vid, priv->eeprom_pid, + priv->eeprom_CustomerID, priv->eeprom_ChannelPlan); /* set channelplan from eeprom */ priv->ChannelPlan = priv->eeprom_ChannelPlan; - if (bLoad_From_EEPOM) - { + if (bLoad_From_EEPOM) { int i; - for (i=0; i<6; i+=2) - { + for (i = 0; i < 6; i += 2) { u16 tmp = 0; - tmp = eprom_read(dev, (u16)((EEPROM_NODE_ADDRESS_BYTE_0 + i)>>1)); - *(u16*)(&dev->dev_addr[i]) = tmp; + tmp = eprom_read(dev, (u16)( + (EEPROM_NODE_ADDRESS_BYTE_0 + i)>>1)); + *(u16 *)(&dev->dev_addr[i]) = tmp; } - } - else - { + } else { memcpy(dev->dev_addr, bMac_Tmp_Addr, 6); /* should I set IDR0 here? */ } @@ -3177,34 +3176,40 @@ static void rtl8192_read_eeprom_info(struct net_device* dev) priv->rf_type = RTL819X_DEFAULT_RF_TYPE; /* default 1T2R */ priv->rf_chip = RF_8256; - if (priv->card_8192_version == (u8)VERSION_819xU_A) - { + if (priv->card_8192_version == (u8)VERSION_819xU_A) { /* read Tx power gain offset of legacy OFDM to HT rate */ if (bLoad_From_EEPOM) - priv->EEPROMTxPowerDiff = (eprom_read(dev, (EEPROM_TxPowerDiff>>1))&0xff00) >> 8; + priv->EEPROMTxPowerDiff = (eprom_read(dev, + (EEPROM_TxPowerDiff>>1))&0xff00) >> 8; else priv->EEPROMTxPowerDiff = EEPROM_Default_TxPower; - RT_TRACE(COMP_EPROM, "TxPowerDiff:%d\n", priv->EEPROMTxPowerDiff); + RT_TRACE(COMP_EPROM, "TxPowerDiff:%d\n", + priv->EEPROMTxPowerDiff); /* read ThermalMeter from EEPROM */ if (bLoad_From_EEPOM) - priv->EEPROMThermalMeter = (u8)(eprom_read(dev, (EEPROM_ThermalMeter>>1))&0x00ff); + priv->EEPROMThermalMeter = (u8)(eprom_read(dev, + (EEPROM_ThermalMeter>>1))&0x00ff); else priv->EEPROMThermalMeter = EEPROM_Default_ThermalMeter; - RT_TRACE(COMP_EPROM, "ThermalMeter:%d\n", priv->EEPROMThermalMeter); + RT_TRACE(COMP_EPROM, "ThermalMeter:%d\n", + priv->EEPROMThermalMeter); /* vivi, for tx power track */ - priv->TSSI_13dBm = priv->EEPROMThermalMeter *100; + priv->TSSI_13dBm = priv->EEPROMThermalMeter * 100; /* read antenna tx power offset of B/C/D to A from EEPROM */ if (bLoad_From_EEPOM) - priv->EEPROMPwDiff = (eprom_read(dev, (EEPROM_PwDiff>>1))&0x0f00)>>8; + priv->EEPROMPwDiff = (eprom_read(dev, + (EEPROM_PwDiff>>1))&0x0f00)>>8; else priv->EEPROMPwDiff = EEPROM_Default_PwDiff; RT_TRACE(COMP_EPROM, "TxPwDiff:%d\n", priv->EEPROMPwDiff); /* Read CrystalCap from EEPROM */ if (bLoad_From_EEPOM) - priv->EEPROMCrystalCap = (eprom_read(dev, (EEPROM_CrystalCap>>1))&0x0f); + priv->EEPROMCrystalCap = (eprom_read(dev, + (EEPROM_CrystalCap>>1))&0x0f); else priv->EEPROMCrystalCap = EEPROM_Default_CrystalCap; - RT_TRACE(COMP_EPROM, "CrystalCap = %d\n", priv->EEPROMCrystalCap); + RT_TRACE(COMP_EPROM, "CrystalCap = %d\n", + priv->EEPROMCrystalCap); /* get per-channel Tx power level */ if (bLoad_From_EEPOM) priv->EEPROM_Def_Ver = (eprom_read(dev, (EEPROM_TxPwIndex_Ver>>1))&0xff00)>>8; -- 1.6.3.3 ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 3/4] staging: rtl8192u: fix checkpatch.pl issues to line 3400 Fix most problems pointed out by checkpatch.pl in file r8192U_core.c up to line 3400 Starting at line 3299 there are some long lines I cannot get rid of. An actual developer may be reuired. 2010-06-10 1:18 ` [PATCH 2/4] staging: rtl8192u: fix checkpatch.pl issues to line 3200 Fix most problems pointed out by checkpatch.pl in file r8192U_core.c up to line 3200 Mike Gilks @ 2010-06-10 1:18 ` Mike Gilks 2010-06-10 1:18 ` [PATCH 4/4] staging: rtl8192u: fix checkpatch.pl issues to line 3500 Fix most problems pointed out by checkpatch.pl in file r8192U_core.c up to line 3500 Mike Gilks 0 siblings, 1 reply; 5+ messages in thread From: Mike Gilks @ 2010-06-10 1:18 UTC (permalink / raw) To: gregkh, mchehab, julia, joe; +Cc: devel, linux-kernel, Mike Gilks Signed-off-by: Mike Gilks <mike.kernel@gilksonline.com> --- drivers/staging/rtl8192u/r8192U_core.c | 137 +++++++++++++++++++------------- 1 files changed, 80 insertions(+), 57 deletions(-) diff --git a/drivers/staging/rtl8192u/r8192U_core.c b/drivers/staging/rtl8192u/r8192U_core.c index f66d66e..14ef649 100644 --- a/drivers/staging/rtl8192u/r8192U_core.c +++ b/drivers/staging/rtl8192u/r8192U_core.c @@ -3212,57 +3212,67 @@ static void rtl8192_read_eeprom_info(struct net_device *dev) priv->EEPROMCrystalCap); /* get per-channel Tx power level */ if (bLoad_From_EEPOM) - priv->EEPROM_Def_Ver = (eprom_read(dev, (EEPROM_TxPwIndex_Ver>>1))&0xff00)>>8; + priv->EEPROM_Def_Ver = (eprom_read(dev, + (EEPROM_TxPwIndex_Ver>>1))&0xff00)>>8; else priv->EEPROM_Def_Ver = 1; - RT_TRACE(COMP_EPROM, "EEPROM_DEF_VER:%d\n", priv->EEPROM_Def_Ver); - if (priv->EEPROM_Def_Ver == 0) /* old eeprom definition */ - { + RT_TRACE(COMP_EPROM, "EEPROM_DEF_VER:%d\n", + priv->EEPROM_Def_Ver); + if (priv->EEPROM_Def_Ver == 0) /* old eeprom definition */ { int i; if (bLoad_From_EEPOM) - priv->EEPROMTxPowerLevelCCK = (eprom_read(dev, (EEPROM_TxPwIndex_CCK>>1))&0xff) >> 8; + priv->EEPROMTxPowerLevelCCK = (eprom_read(dev, + (EEPROM_TxPwIndex_CCK>>1))&0xff) >> 8; else priv->EEPROMTxPowerLevelCCK = 0x10; - RT_TRACE(COMP_EPROM, "CCK Tx Power Levl: 0x%02x\n", priv->EEPROMTxPowerLevelCCK); - for (i=0; i<3; i++) - { - if (bLoad_From_EEPOM) - { - tmpValue = eprom_read(dev, (EEPROM_TxPwIndex_OFDM_24G+i)>>1); - if (((EEPROM_TxPwIndex_OFDM_24G+i) % 2) == 0) + RT_TRACE(COMP_EPROM, "CCK Tx Power Levl: 0x%02x\n", + priv->EEPROMTxPowerLevelCCK); + for (i = 0; i < 3; i++) { + if (bLoad_From_EEPOM) { + tmpValue = eprom_read(dev, + (EEPROM_TxPwIndex_OFDM_24G+i) + >>1); + if (((EEPROM_TxPwIndex_OFDM_24G+i) % 2) + == 0) tmpValue = tmpValue & 0x00ff; else - tmpValue = (tmpValue & 0xff00) >> 8; - } - else + tmpValue = (tmpValue & 0xff00) + >> 8; + } else tmpValue = 0x10; - priv->EEPROMTxPowerLevelOFDM24G[i] = (u8) tmpValue; - RT_TRACE(COMP_EPROM, "OFDM 2.4G Tx Power Level, Index %d = 0x%02x\n", i, priv->EEPROMTxPowerLevelCCK); + priv->EEPROMTxPowerLevelOFDM24G[i] = + (u8) tmpValue; + RT_TRACE(COMP_EPROM, "OFDM 2.4G Tx Power Level" + ", Index %d = 0x%02x\n", i, + priv->EEPROMTxPowerLevelCCK); } - } /* end if EEPROM_DEF_VER == 0 */ - else if (priv->EEPROM_Def_Ver == 1) - { - if (bLoad_From_EEPOM) - { - tmpValue = eprom_read(dev, (EEPROM_TxPwIndex_CCK_V1>>1)); + /* end if EEPROM_DEF_VER == 0 */ + } else if (priv->EEPROM_Def_Ver == 1) { + if (bLoad_From_EEPOM) { + tmpValue = eprom_read(dev, + (EEPROM_TxPwIndex_CCK_V1>>1)); tmpValue = (tmpValue & 0xff00) >> 8; - } - else + } else tmpValue = 0x10; priv->EEPROMTxPowerLevelCCK_V1[0] = (u8)tmpValue; if (bLoad_From_EEPOM) - tmpValue = eprom_read(dev, (EEPROM_TxPwIndex_CCK_V1 + 2)>>1); + tmpValue = eprom_read(dev, + (EEPROM_TxPwIndex_CCK_V1 + 2)>>1); else tmpValue = 0x1010; - *((u16*)(&priv->EEPROMTxPowerLevelCCK_V1[1])) = tmpValue; + *((u16 *)(&priv->EEPROMTxPowerLevelCCK_V1[1])) = + tmpValue; if (bLoad_From_EEPOM) - tmpValue = eprom_read(dev, (EEPROM_TxPwIndex_OFDM_24G_V1>>1)); + tmpValue = eprom_read(dev, + (EEPROM_TxPwIndex_OFDM_24G_V1>>1)); else tmpValue = 0x1010; - *((u16*)(&priv->EEPROMTxPowerLevelOFDM24G[0])) = tmpValue; + *((u16 *)(&priv->EEPROMTxPowerLevelOFDM24G[0])) = + tmpValue; if (bLoad_From_EEPOM) - tmpValue = eprom_read(dev, (EEPROM_TxPwIndex_OFDM_24G_V1+2)>>1); + tmpValue = eprom_read(dev, + (EEPROM_TxPwIndex_OFDM_24G_V1+2)>>1); else tmpValue = 0x10; priv->EEPROMTxPowerLevelOFDM24G[2] = (u8)tmpValue; @@ -3273,29 +3283,43 @@ static void rtl8192_read_eeprom_info(struct net_device *dev) int i; for (i = 0; i < 14; i++) { if (i <= 3) - priv->TxPowerLevelOFDM24G[i] = priv->EEPROMTxPowerLevelOFDM24G[0]; + priv->TxPowerLevelOFDM24G[i] = priv-> + EEPROMTxPowerLevelOFDM24G[0]; else if (i >= 4 && i <= 9) - priv->TxPowerLevelOFDM24G[i] = priv->EEPROMTxPowerLevelOFDM24G[1]; + priv->TxPowerLevelOFDM24G[i] = priv-> + EEPROMTxPowerLevelOFDM24G[1]; else - priv->TxPowerLevelOFDM24G[i] = priv->EEPROMTxPowerLevelOFDM24G[2]; + priv->TxPowerLevelOFDM24G[i] = priv-> + EEPROMTxPowerLevelOFDM24G[2]; } for (i = 0; i < 14; i++) { if (priv->EEPROM_Def_Ver == 0) { if (i <= 3) - priv->TxPowerLevelCCK[i] = priv->EEPROMTxPowerLevelOFDM24G[0] + (priv->EEPROMTxPowerLevelCCK - priv->EEPROMTxPowerLevelOFDM24G[1]); + priv->TxPowerLevelCCK[i] = + priv->EEPROMTxPowerLevelOFDM24G[0] + + (priv->EEPROMTxPowerLevelCCK - priv-> + EEPROMTxPowerLevelOFDM24G[1]); else if (i >= 4 && i <= 9) - priv->TxPowerLevelCCK[i] = priv->EEPROMTxPowerLevelCCK; + priv->TxPowerLevelCCK[i] = + priv->EEPROMTxPowerLevelCCK; else - priv->TxPowerLevelCCK[i] = priv->EEPROMTxPowerLevelOFDM24G[2] + (priv->EEPROMTxPowerLevelCCK - priv->EEPROMTxPowerLevelOFDM24G[1]); - } - else if (priv->EEPROM_Def_Ver == 1) - { - if (i<=3) - priv->TxPowerLevelCCK[i] = priv->EEPROMTxPowerLevelCCK_V1[0]; - else if (i>=4 && i<=9) - priv->TxPowerLevelCCK[i] = priv->EEPROMTxPowerLevelCCK_V1[1]; + priv->TxPowerLevelCCK[i] = + priv->EEPROMTxPowerLevelOFDM24G[2] + + (priv->EEPROMTxPowerLevelCCK - + priv->EEPROMTxPowerLevelOFDM24G[1]); + } else if (priv->EEPROM_Def_Ver == 1) { + if (i <= 3) + priv->TxPowerLevelCCK[i] = + priv->EEPROMTxPowerLevelCCK_V1 + [0]; + else if (i >= 4 && i <= 9) + priv->TxPowerLevelCCK[i] = + priv->EEPROMTxPowerLevelCCK_V1 + [1]; else - priv->TxPowerLevelCCK[i] = priv->EEPROMTxPowerLevelCCK_V1[2]; + priv->TxPowerLevelCCK[i] = + priv->EEPROMTxPowerLevelCCK_V1 + [2]; } } } /* end update HAL variables */ @@ -3313,7 +3337,7 @@ static void rtl8192_read_eeprom_info(struct net_device *dev) } /* end if VersionID == VERSION_819xU_A */ /* added by vivi, for dlink led, 20080416 */ - switch(priv->eeprom_CustomerID) { + switch (priv->eeprom_CustomerID) { case EEPROM_CID_RUNTOP: priv->CustomerID = RT_CID_819x_RUNTOP; break; @@ -3325,7 +3349,7 @@ static void rtl8192_read_eeprom_info(struct net_device *dev) break; } - switch(priv->CustomerID) { + switch (priv->CustomerID) { case RT_CID_819x_RUNTOP: priv->LedStrategy = SW_LED_MODE2; break; @@ -3339,9 +3363,8 @@ static void rtl8192_read_eeprom_info(struct net_device *dev) if (priv->rf_type == RF_1T2R) { RT_TRACE(COMP_EPROM, "\n1T2R config\n"); - } else { + } else RT_TRACE(COMP_EPROM, "\n2T4R config\n"); - } /* 2008/01/16 MH We can only know RF type in the function. * So we have to init DIG RATR table again. @@ -3353,28 +3376,28 @@ static void rtl8192_read_eeprom_info(struct net_device *dev) return; } -short rtl8192_get_channel_map(struct net_device * dev) +short rtl8192_get_channel_map(struct net_device *dev) { struct r8192_priv *priv = ieee80211_priv(dev); #ifdef ENABLE_DOT11D - if(priv->ChannelPlan > COUNTRY_CODE_GLOBAL_DOMAIN){ + if (priv->ChannelPlan > COUNTRY_CODE_GLOBAL_DOMAIN) { printk("rtl8180_init:Error channel plan! Set to default.\n"); - priv->ChannelPlan= 0; + priv->ChannelPlan = 0; } - RT_TRACE(COMP_INIT, "Channel plan is %d\n",priv->ChannelPlan); + RT_TRACE(COMP_INIT, "Channel plan is %d\n", priv->ChannelPlan); rtl819x_set_channel_map(priv->ChannelPlan, priv); #else - int ch,i; + int ch, i; /* Set Default Channel Plan */ - if(!channels){ + if (!channels) { DMESG("No channels, aborting"); return -1; } - ch=channels; - priv->ChannelPlan= 0; /* hikaru */ + ch = channels; + priv->ChannelPlan = 0; /* hikaru */ /* set channels 1..14 allowed in given locale */ - for (i=1; i<=14; i++) { + for (i = 1; i <= 14; i++) { (priv->ieee80211->channel_map)[i] = (u8)(ch & 0x01); ch >>= 1; } -- 1.6.3.3 ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 4/4] staging: rtl8192u: fix checkpatch.pl issues to line 3500 Fix most problems pointed out by checkpatch.pl in file r8192U_core.c up to line 3500 2010-06-10 1:18 ` [PATCH 3/4] staging: rtl8192u: fix checkpatch.pl issues to line 3400 Fix most problems pointed out by checkpatch.pl in file r8192U_core.c up to line 3400 Starting at line 3299 there are some long lines I cannot get rid of. An actual developer may be reuired Mike Gilks @ 2010-06-10 1:18 ` Mike Gilks 0 siblings, 0 replies; 5+ messages in thread From: Mike Gilks @ 2010-06-10 1:18 UTC (permalink / raw) To: gregkh, mchehab, julia, joe; +Cc: devel, linux-kernel, Mike Gilks Signed-off-by: Mike Gilks <mike.kernel@gilksonline.com> --- drivers/staging/rtl8192u/r8192U_core.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/staging/rtl8192u/r8192U_core.c b/drivers/staging/rtl8192u/r8192U_core.c index 14ef649..6f20518 100644 --- a/drivers/staging/rtl8192u/r8192U_core.c +++ b/drivers/staging/rtl8192u/r8192U_core.c @@ -3410,13 +3410,13 @@ short rtl8192_init(struct net_device *dev) struct r8192_priv *priv = ieee80211_priv(dev); - memset(&(priv->stats),0,sizeof(struct Stats)); - memset(priv->txqueue_to_outpipemap,0,9); + memset(&(priv->stats), 0, sizeof(struct Stats)); + memset(priv->txqueue_to_outpipemap, 0, 9); #ifdef PIPE12 { int i = 0; - u8 queuetopipe[]={3, 2, 1, 0, 4, 8, 7, 6, 5}; - memcpy(priv->txqueue_to_outpipemap,queuetopipe, 9); + u8 queuetopipe[] = {3, 2, 1, 0, 4, 8, 7, 6, 5}; + memcpy(priv->txqueue_to_outpipemap, queuetopipe, 9); /* for(i = 0; i < 9; i++) * printk("%d ", priv->txqueue_to_outpipemap[i]); *printk("\n"); @@ -3424,8 +3424,8 @@ short rtl8192_init(struct net_device *dev) } #else { - u8 queuetopipe[]={3, 2, 1, 0, 4, 4, 0, 4, 4}; - memcpy(priv->txqueue_to_outpipemap,queuetopipe, 9); + u8 queuetopipe[] = {3, 2, 1, 0, 4, 4, 0, 4, 4}; + memcpy(priv->txqueue_to_outpipemap, queuetopipe, 9); /* for(i = 0; i < 9; i++) * printk("%d ", priv->txqueue_to_outpipemap[i]); *printk("\n"); @@ -3442,7 +3442,7 @@ short rtl8192_init(struct net_device *dev) init_timer(&priv->watch_dog_timer); priv->watch_dog_timer.data = (unsigned long)dev; priv->watch_dog_timer.function = watch_dog_timer_callback; - if(rtl8192_usb_initendpoints(dev)!=0){ + if (rtl8192_usb_initendpoints(dev) != 0) { DMESG("Endopoints initialization failed"); return -ENOMEM; } @@ -3463,7 +3463,7 @@ short rtl8192_init(struct net_device *dev) * notice: This part need to modified according to the rate set we filtered * **************************************************************************** */ -void rtl8192_hwconfig(struct net_device* dev) +void rtl8192_hwconfig(struct net_device *dev) { u32 regRATR = 0, regRRSR = 0; u8 regBwOpMode = 0, regTmp = 0; @@ -3477,7 +3477,7 @@ void rtl8192_hwconfig(struct net_device* dev) regRRSR = RATE_ALL_CCK; break; case WIRELESS_MODE_A: - regBwOpMode = BW_OPMODE_5G |BW_OPMODE_20MHZ; + regBwOpMode = BW_OPMODE_5G | BW_OPMODE_20MHZ; regRATR = RATE_ALL_OFDM_AG; regRRSR = RATE_ALL_OFDM_AG; break; -- 1.6.3.3 ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2010-06-10 1:17 UTC | newest] Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2010-06-10 1:18 Mike Gilks 2010-06-10 1:18 ` [PATCH 1/4] staging: rtl8192u: fix checkpatch.pl issues to line 3100 Fix most problems pointed out by checkpatch.pl in file r8192U_core.c up to line 3100 Mike Gilks 2010-06-10 1:18 ` [PATCH 2/4] staging: rtl8192u: fix checkpatch.pl issues to line 3200 Fix most problems pointed out by checkpatch.pl in file r8192U_core.c up to line 3200 Mike Gilks 2010-06-10 1:18 ` [PATCH 3/4] staging: rtl8192u: fix checkpatch.pl issues to line 3400 Fix most problems pointed out by checkpatch.pl in file r8192U_core.c up to line 3400 Starting at line 3299 there are some long lines I cannot get rid of. An actual developer may be reuired Mike Gilks 2010-06-10 1:18 ` [PATCH 4/4] staging: rtl8192u: fix checkpatch.pl issues to line 3500 Fix most problems pointed out by checkpatch.pl in file r8192U_core.c up to line 3500 Mike Gilks
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®