From 4116ad1d993cc72f84f0c4cf370ac314ad9f799e Mon Sep 17 00:00:00 2001 From: John Whitmore Date: Sun, 29 Jul 2018 00:14:46 +0100 Subject: [PATCH] staging:rtl8192u: Rename ACI_AIFSN - Style Rename the union ACI_AIFSN to aci_aifsn and remove the typedef directive. The removal of the typedef clears the checkpatch issue with defining new types. The renaming is to adhere to the coding style where types are name in lower case. These changes are coding style changes which should have no impact on runtime execution. Signed-off-by: John Whitmore Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h | 6 +++--- drivers/staging/rtl8192u/r8192U_dm.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h b/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h index 92afa9dc9663..5856bf87c5dc 100644 --- a/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h +++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h @@ -13,7 +13,7 @@ // ACI/AIFSN Field. // Ref: WMM spec 2.2.2: WME Parameter Element, p.12. // -typedef union _ACI_AIFSN { +union aci_aifsn { u8 charData; struct { @@ -22,7 +22,7 @@ typedef union _ACI_AIFSN { u8 ACI:2; u8 Reserved:1; } f; // Field -} ACI_AIFSN, *PACI_AIFSN; +}; // // ECWmin/ECWmax field. @@ -45,7 +45,7 @@ typedef union _AC_PARAM { u8 charData[4]; struct { - ACI_AIFSN AciAifsn; + union aci_aifsn AciAifsn; ECW Ecw; u16 TXOPLimit; } f; // Field diff --git a/drivers/staging/rtl8192u/r8192U_dm.c b/drivers/staging/rtl8192u/r8192U_dm.c index c4e4e3ba394b..04c08ca8a0bb 100644 --- a/drivers/staging/rtl8192u/r8192U_dm.c +++ b/drivers/staging/rtl8192u/r8192U_dm.c @@ -2333,7 +2333,7 @@ static void dm_check_edca_turbo( { /* TODO: Modified this part and try to set acm control in only 1 IO processing!! */ - PACI_AIFSN pAciAifsn = (PACI_AIFSN)&(qos_parameters->aifs[0]); + union aci_aifsn *pAciAifsn = (union aci_aifsn *)&(qos_parameters->aifs[0]); u8 AcmCtrl; read_nic_byte(dev, AcmHwCtrl, &AcmCtrl); -- 2.45.2