Re: [PATCH 03/20] staging: rtl8188eu: Rework function PHY_QueryBBReg()
On Sun, Aug 31, 2014 at 2:14 AM, Greg KH wrote: > On Sat, Aug 23, 2014 at 07:48:24PM +0530, navin patidar wrote: >> Rename CamelCase variables and function name. >> >> Signed-off-by: navin patidar > > This patch fails to apply: > > checking file drivers/staging/rtl8188eu/hal/HalHWImg8188E_RF.c > checking file drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c > checking file drivers/staging/rtl8188eu/hal/odm.c > checking file drivers/staging/rtl8188eu/hal/odm_RTL8188E.c > checking file drivers/staging/rtl8188eu/hal/rtl8188e_phycfg.c > checking file drivers/staging/rtl8188eu/hal/usb_halinit.c > checking file drivers/staging/rtl8188eu/include/Hal8188EPhyCfg.h > checking file drivers/staging/rtl8188eu/include/phy.h > Hunk #1 FAILED at 1. > 1 out of 1 hunk FAILED > > Can you please refresh it against my staging-next branch of the > staging.git tree on git.kernel.org and resend it, and the rest of the > patches in this series so that I can apply them? I've sent v2 of the rest of the patches in this series. regards, --navin-patidar -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 03/20] staging: rtl8188eu: Rework function PHY_QueryBBReg()
On Sun, Aug 31, 2014 at 2:14 AM, Greg KH gre...@linuxfoundation.org wrote: On Sat, Aug 23, 2014 at 07:48:24PM +0530, navin patidar wrote: Rename CamelCase variables and function name. Signed-off-by: navin patidar navin.pati...@gmail.com This patch fails to apply: checking file drivers/staging/rtl8188eu/hal/HalHWImg8188E_RF.c checking file drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c checking file drivers/staging/rtl8188eu/hal/odm.c checking file drivers/staging/rtl8188eu/hal/odm_RTL8188E.c checking file drivers/staging/rtl8188eu/hal/rtl8188e_phycfg.c checking file drivers/staging/rtl8188eu/hal/usb_halinit.c checking file drivers/staging/rtl8188eu/include/Hal8188EPhyCfg.h checking file drivers/staging/rtl8188eu/include/phy.h Hunk #1 FAILED at 1. 1 out of 1 hunk FAILED Can you please refresh it against my staging-next branch of the staging.git tree on git.kernel.org and resend it, and the rest of the patches in this series so that I can apply them? I've sent v2 of the rest of the patches in this series. regards, --navin-patidar -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 03/20] staging: rtl8188eu: Rework function PHY_QueryBBReg()
On Sat, Aug 23, 2014 at 07:48:24PM +0530, navin patidar wrote: > Rename CamelCase variables and function name. > > Signed-off-by: navin patidar This patch fails to apply: checking file drivers/staging/rtl8188eu/hal/HalHWImg8188E_RF.c checking file drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c checking file drivers/staging/rtl8188eu/hal/odm.c checking file drivers/staging/rtl8188eu/hal/odm_RTL8188E.c checking file drivers/staging/rtl8188eu/hal/rtl8188e_phycfg.c checking file drivers/staging/rtl8188eu/hal/usb_halinit.c checking file drivers/staging/rtl8188eu/include/Hal8188EPhyCfg.h checking file drivers/staging/rtl8188eu/include/phy.h Hunk #1 FAILED at 1. 1 out of 1 hunk FAILED Can you please refresh it against my staging-next branch of the staging.git tree on git.kernel.org and resend it, and the rest of the patches in this series so that I can apply them? thanks, greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 03/20] staging: rtl8188eu: Rework function PHY_QueryBBReg()
On Sat, Aug 23, 2014 at 07:48:24PM +0530, navin patidar wrote: Rename CamelCase variables and function name. Signed-off-by: navin patidar navin.pati...@gmail.com This patch fails to apply: checking file drivers/staging/rtl8188eu/hal/HalHWImg8188E_RF.c checking file drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c checking file drivers/staging/rtl8188eu/hal/odm.c checking file drivers/staging/rtl8188eu/hal/odm_RTL8188E.c checking file drivers/staging/rtl8188eu/hal/rtl8188e_phycfg.c checking file drivers/staging/rtl8188eu/hal/usb_halinit.c checking file drivers/staging/rtl8188eu/include/Hal8188EPhyCfg.h checking file drivers/staging/rtl8188eu/include/phy.h Hunk #1 FAILED at 1. 1 out of 1 hunk FAILED Can you please refresh it against my staging-next branch of the staging.git tree on git.kernel.org and resend it, and the rest of the patches in this series so that I can apply them? thanks, greg k-h -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH 03/20] staging: rtl8188eu: Rework function PHY_QueryBBReg()
Rename CamelCase variables and function name.
Signed-off-by: navin patidar
---
drivers/staging/rtl8188eu/hal/HalHWImg8188E_RF.c |8 +--
drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c | 69 ++--
drivers/staging/rtl8188eu/hal/odm.c| 31 -
drivers/staging/rtl8188eu/hal/odm_RTL8188E.c |9 +--
drivers/staging/rtl8188eu/hal/rtl8188e_phycfg.c| 44 -
drivers/staging/rtl8188eu/hal/usb_halinit.c|2 +-
drivers/staging/rtl8188eu/include/Hal8188EPhyCfg.h |3 -
drivers/staging/rtl8188eu/include/phy.h|2 +
8 files changed, 75 insertions(+), 93 deletions(-)
diff --git a/drivers/staging/rtl8188eu/hal/HalHWImg8188E_RF.c
b/drivers/staging/rtl8188eu/hal/HalHWImg8188E_RF.c
index 94ee740..0284602 100644
--- a/drivers/staging/rtl8188eu/hal/HalHWImg8188E_RF.c
+++ b/drivers/staging/rtl8188eu/hal/HalHWImg8188E_RF.c
@@ -245,13 +245,13 @@ static bool rf6052_conf_para(struct adapter *adapt)
switch (rfpath) {
case RF90_PATH_A:
case RF90_PATH_C:
- u4val = PHY_QueryBBReg(adapt, pphyreg->rfintfs,
- BRFSI_RFENV);
+ u4val = phy_query_bb_reg(adapt, pphyreg->rfintfs,
+BRFSI_RFENV);
break;
case RF90_PATH_B:
case RF90_PATH_D:
- u4val = PHY_QueryBBReg(adapt, pphyreg->rfintfs,
- BRFSI_RFENV << 16);
+ u4val = phy_query_bb_reg(adapt, pphyreg->rfintfs,
+BRFSI_RFENV << 16);
break;
}
diff --git a/drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c
b/drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c
index d2bcc16..e36fa5e 100644
--- a/drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c
+++ b/drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c
@@ -17,6 +17,7 @@
*/
#include "odm_precomp.h"
+#include "phy.h"
/* 2010/04/25 MH Define the max tx power tracking tx agc power. */
#defineODM_TXPWRTRACK_MAX_IDX_88E 6
@@ -181,7 +182,7 @@ odm_TXPowerTrackingCallback_ThermalMeter_8188E(
if (ThermalValue) {
/* Query OFDM path A default setting */
- ele_D = PHY_QueryBBReg(Adapter, rOFDM0_XATxIQImbalance,
bMaskDWord)_D;
+ ele_D = phy_query_bb_reg(Adapter, rOFDM0_XATxIQImbalance,
bMaskDWord)_D;
for (i = 0; i < OFDM_TABLE_SIZE_92D; i++) { /* find the
index */
if (ele_D == (OFDMSwingTable[i]_D)) {
OFDM_index_old[0] = (u8)i;
@@ -195,7 +196,7 @@ odm_TXPowerTrackingCallback_ThermalMeter_8188E(
/* Query OFDM path B default setting */
if (is2t) {
- ele_D = PHY_QueryBBReg(Adapter, rOFDM0_XBTxIQImbalance,
bMaskDWord)_D;
+ ele_D = phy_query_bb_reg(Adapter,
rOFDM0_XBTxIQImbalance, bMaskDWord)_D;
for (i = 0; i < OFDM_TABLE_SIZE_92D; i++) { /* find
the index */
if (ele_D == (OFDMSwingTable[i]_D)) {
OFDM_index_old[1] = (u8)i;
@@ -444,7 +445,7 @@ odm_TXPowerTrackingCallback_ThermalMeter_8188E(
ODM_RT_TRACE(dm_odm, ODM_COMP_CALIBRATION,
ODM_DBG_LOUD,
("TxPwrTracking 0xc80 = 0x%x,
0xc94 = 0x%x RF 0x24 = 0x%x\n",
-PHY_QueryBBReg(Adapter, 0xc80,
bMaskDWord), PHY_QueryBBReg(Adapter,
+phy_query_bb_reg(Adapter, 0xc80,
bMaskDWord), phy_query_bb_reg(Adapter,
0xc94, bMaskDWord),
PHY_QueryRFReg(Adapter, RF_PATH_A, 0x24, bRFRegOffsetMask)));
}
}
@@ -497,13 +498,13 @@ phy_PathA_IQK_8188E(struct adapter *adapt, bool
configPathB)
mdelay(IQK_DELAY_TIME_88E);
/* Check failed */
- regeac = PHY_QueryBBReg(adapt, rRx_Power_After_IQK_A_2, bMaskDWord);
+ regeac = phy_query_bb_reg(adapt, rRx_Power_After_IQK_A_2, bMaskDWord);
ODM_RT_TRACE(dm_odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("0xeac =
0x%x\n", regeac));
- regE94 = PHY_QueryBBReg(adapt, rTx_Power_Before_IQK_A, bMaskDWord);
+ regE94 = phy_query_bb_reg(adapt, rTx_Power_Before_IQK_A, bMaskDWord);
ODM_RT_TRACE(dm_odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("0xe94 =
0x%x\n", regE94));
- regE9C = PHY_QueryBBReg(adapt, rTx_Power_After_IQK_A, bMaskDWord);
+ regE9C = phy_query_bb_reg(adapt, rTx_Power_After_IQK_A, bMaskDWord);
ODM_RT_TRACE(dm_odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("0xe9c =
0x%x\n", regE9C));
- regEA4 = PHY_QueryBBReg(adapt,
[PATCH 03/20] staging: rtl8188eu: Rework function PHY_QueryBBReg()
Rename CamelCase variables and function name.
Signed-off-by: navin patidar navin.pati...@gmail.com
---
drivers/staging/rtl8188eu/hal/HalHWImg8188E_RF.c |8 +--
drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c | 69 ++--
drivers/staging/rtl8188eu/hal/odm.c| 31 -
drivers/staging/rtl8188eu/hal/odm_RTL8188E.c |9 +--
drivers/staging/rtl8188eu/hal/rtl8188e_phycfg.c| 44 -
drivers/staging/rtl8188eu/hal/usb_halinit.c|2 +-
drivers/staging/rtl8188eu/include/Hal8188EPhyCfg.h |3 -
drivers/staging/rtl8188eu/include/phy.h|2 +
8 files changed, 75 insertions(+), 93 deletions(-)
diff --git a/drivers/staging/rtl8188eu/hal/HalHWImg8188E_RF.c
b/drivers/staging/rtl8188eu/hal/HalHWImg8188E_RF.c
index 94ee740..0284602 100644
--- a/drivers/staging/rtl8188eu/hal/HalHWImg8188E_RF.c
+++ b/drivers/staging/rtl8188eu/hal/HalHWImg8188E_RF.c
@@ -245,13 +245,13 @@ static bool rf6052_conf_para(struct adapter *adapt)
switch (rfpath) {
case RF90_PATH_A:
case RF90_PATH_C:
- u4val = PHY_QueryBBReg(adapt, pphyreg-rfintfs,
- BRFSI_RFENV);
+ u4val = phy_query_bb_reg(adapt, pphyreg-rfintfs,
+BRFSI_RFENV);
break;
case RF90_PATH_B:
case RF90_PATH_D:
- u4val = PHY_QueryBBReg(adapt, pphyreg-rfintfs,
- BRFSI_RFENV 16);
+ u4val = phy_query_bb_reg(adapt, pphyreg-rfintfs,
+BRFSI_RFENV 16);
break;
}
diff --git a/drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c
b/drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c
index d2bcc16..e36fa5e 100644
--- a/drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c
+++ b/drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c
@@ -17,6 +17,7 @@
*/
#include odm_precomp.h
+#include phy.h
/* 2010/04/25 MH Define the max tx power tracking tx agc power. */
#defineODM_TXPWRTRACK_MAX_IDX_88E 6
@@ -181,7 +182,7 @@ odm_TXPowerTrackingCallback_ThermalMeter_8188E(
if (ThermalValue) {
/* Query OFDM path A default setting */
- ele_D = PHY_QueryBBReg(Adapter, rOFDM0_XATxIQImbalance,
bMaskDWord)bMaskOFDM_D;
+ ele_D = phy_query_bb_reg(Adapter, rOFDM0_XATxIQImbalance,
bMaskDWord)bMaskOFDM_D;
for (i = 0; i OFDM_TABLE_SIZE_92D; i++) { /* find the
index */
if (ele_D == (OFDMSwingTable[i]bMaskOFDM_D)) {
OFDM_index_old[0] = (u8)i;
@@ -195,7 +196,7 @@ odm_TXPowerTrackingCallback_ThermalMeter_8188E(
/* Query OFDM path B default setting */
if (is2t) {
- ele_D = PHY_QueryBBReg(Adapter, rOFDM0_XBTxIQImbalance,
bMaskDWord)bMaskOFDM_D;
+ ele_D = phy_query_bb_reg(Adapter,
rOFDM0_XBTxIQImbalance, bMaskDWord)bMaskOFDM_D;
for (i = 0; i OFDM_TABLE_SIZE_92D; i++) { /* find
the index */
if (ele_D == (OFDMSwingTable[i]bMaskOFDM_D)) {
OFDM_index_old[1] = (u8)i;
@@ -444,7 +445,7 @@ odm_TXPowerTrackingCallback_ThermalMeter_8188E(
ODM_RT_TRACE(dm_odm, ODM_COMP_CALIBRATION,
ODM_DBG_LOUD,
(TxPwrTracking 0xc80 = 0x%x,
0xc94 = 0x%x RF 0x24 = 0x%x\n,
-PHY_QueryBBReg(Adapter, 0xc80,
bMaskDWord), PHY_QueryBBReg(Adapter,
+phy_query_bb_reg(Adapter, 0xc80,
bMaskDWord), phy_query_bb_reg(Adapter,
0xc94, bMaskDWord),
PHY_QueryRFReg(Adapter, RF_PATH_A, 0x24, bRFRegOffsetMask)));
}
}
@@ -497,13 +498,13 @@ phy_PathA_IQK_8188E(struct adapter *adapt, bool
configPathB)
mdelay(IQK_DELAY_TIME_88E);
/* Check failed */
- regeac = PHY_QueryBBReg(adapt, rRx_Power_After_IQK_A_2, bMaskDWord);
+ regeac = phy_query_bb_reg(adapt, rRx_Power_After_IQK_A_2, bMaskDWord);
ODM_RT_TRACE(dm_odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, (0xeac =
0x%x\n, regeac));
- regE94 = PHY_QueryBBReg(adapt, rTx_Power_Before_IQK_A, bMaskDWord);
+ regE94 = phy_query_bb_reg(adapt, rTx_Power_Before_IQK_A, bMaskDWord);
ODM_RT_TRACE(dm_odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, (0xe94 =
0x%x\n, regE94));
- regE9C = PHY_QueryBBReg(adapt, rTx_Power_After_IQK_A, bMaskDWord);
+ regE9C = phy_query_bb_reg(adapt, rTx_Power_After_IQK_A, bMaskDWord);
ODM_RT_TRACE(dm_odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, (0xe9c =
0x%x\n,
