Rename variable TPPoll_CQ to TP_POLL_CQ and AcmHwCtrl to ACM_HW_CTRL and AcmHw_BeqEn to ACM_HW_BEQ_EN to avoid CamelCase which is not accepted by checkpatch. Signed-off-by: Philipp Hortmann <philipp.g.hortmann@xxxxxxxxx> --- drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c | 2 +- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 10 +++++----- drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c index 374f61e931f5..eba8364d0ff2 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c @@ -76,7 +76,7 @@ bool rtl92e_send_cmd_pkt(struct net_device *dev, u32 type, const void *data, } while (frag_offset < len); - rtl92e_writeb(dev, TP_POLL, TPPoll_CQ); + rtl92e_writeb(dev, TP_POLL, TP_POLL_CQ); Failed: return rt_status; } diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c index 37d304a0f4c1..dc6e694840af 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -216,12 +216,12 @@ void rtl92e_set_reg(struct net_device *dev, u8 variable, u8 *val) union aci_aifsn *pAciAifsn = (union aci_aifsn *)& (qos_parameters->aifs[0]); u8 acm = pAciAifsn->f.acm; - u8 AcmCtrl = rtl92e_readb(dev, AcmHwCtrl); + u8 AcmCtrl = rtl92e_readb(dev, ACM_HW_CTRL); if (acm) { switch (eACI) { case AC0_BE: - AcmCtrl |= AcmHw_BeqEn; + AcmCtrl |= ACM_HW_BEQ_EN; break; case AC2_VI: @@ -235,7 +235,7 @@ void rtl92e_set_reg(struct net_device *dev, u8 variable, u8 *val) } else { switch (eACI) { case AC0_BE: - AcmCtrl &= (~AcmHw_BeqEn); + AcmCtrl &= (~ACM_HW_BEQ_EN); break; case AC2_VI: @@ -243,14 +243,14 @@ void rtl92e_set_reg(struct net_device *dev, u8 variable, u8 *val) break; case AC3_VO: - AcmCtrl &= (~AcmHw_BeqEn); + AcmCtrl &= (~ACM_HW_BEQ_EN); break; default: break; } } - rtl92e_writeb(dev, AcmHwCtrl, AcmCtrl); + rtl92e_writeb(dev, ACM_HW_CTRL, AcmCtrl); break; } diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h b/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h index 1cb723f71f43..c3b573090d39 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h @@ -129,7 +129,7 @@ enum _RTL8192PCI_HW { #define IMR_ROK BIT0 ISR = 0x0f8, TP_POLL = 0x0fd, -#define TPPoll_CQ BIT5 +#define TP_POLL_CQ BIT5 PSR = 0x0ff, CPU_GEN = 0x100, #define CPU_CCK_LOOPBACK 0x00030000 @@ -142,8 +142,8 @@ enum _RTL8192PCI_HW { #define CPU_GEN_PWR_STB_CPU 0x00000004 #define CPU_GEN_NO_LOOPBACK_MSK 0xFFF8FFFF #define CPU_GEN_NO_LOOPBACK_SET 0x00080000 - AcmHwCtrl = 0x171, -#define AcmHw_BeqEn BIT1 + ACM_HW_CTRL = 0x171, +#define ACM_HW_BEQ_EN BIT1 #define AcmHw_ViqEn BIT2 #define AcmHw_VoqEn BIT3 RQPN1 = 0x180, -- 2.39.1