* [PATCH v2 0/3] staging: vt6655: replace camel case variables
@ 2021-09-24 20:59 ` Tommaso Merciai
0 siblings, 0 replies; 13+ messages in thread
From: Tommaso Merciai @ 2021-09-24 20:59 UTC (permalink / raw)
Cc: tomm.merciai, Forest Bond, Greg Kroah-Hartman,
Madhumitha Prabakaran, Yujia Qiao, Lucas Henneman,
Aldas Taraškevičius, Gustavo A. R. Silva,
Deepak R Varma, Marcos Antonio de Jesus Filho, linux-staging,
linux-kernel
bShortSlotTime -> b_short_slot_time
ldBmThreshold -> ld_bm_threshold
PortOffset -> port_offset
Tommaso Merciai (3):
staging: vt6655: replace camel case b_short_slot_time instead of
bShortSlotTime.
staging: vt6655: replace camel case ld_bm_threshold instead of
ldBmThreshold.
staging: vt6655: replace camel case port_offset instead of PortOffset.
drivers/staging/vt6655/baseband.c | 58 +++++------
drivers/staging/vt6655/card.c | 90 ++++++++--------
drivers/staging/vt6655/channel.c | 10 +-
drivers/staging/vt6655/device.h | 6 +-
drivers/staging/vt6655/device_main.c | 150 +++++++++++++--------------
drivers/staging/vt6655/mac.c | 46 ++++----
drivers/staging/vt6655/power.c | 24 ++---
drivers/staging/vt6655/rf.c | 12 +--
drivers/staging/vt6655/rxtx.c | 12 +--
9 files changed, 204 insertions(+), 204 deletions(-)
--
2.25.1
^ permalink raw reply [flat|nested] 13+ messages in thread* [PATCH v2 0/3] staging: vt6655: replace camel case variables @ 2021-09-24 20:59 ` Tommaso Merciai 0 siblings, 0 replies; 13+ messages in thread From: Tommaso Merciai @ 2021-09-24 20:59 UTC (permalink / raw) Cc: tomm.merciai, Forest Bond, Greg Kroah-Hartman, Madhumitha Prabakaran, Yujia Qiao, Lucas Henneman, Aldas Taraškevičius, Gustavo A. R. Silva, Deepak R Varma, Marcos Antonio de Jesus Filho, linux-staging, linux-kernel bShortSlotTime -> b_short_slot_time ldBmThreshold -> ld_bm_threshold PortOffset -> port_offset Tommaso Merciai (3): staging: vt6655: replace camel case b_short_slot_time instead of bShortSlotTime. staging: vt6655: replace camel case ld_bm_threshold instead of ldBmThreshold. staging: vt6655: replace camel case port_offset instead of PortOffset. drivers/staging/vt6655/baseband.c | 58 +++++------ drivers/staging/vt6655/card.c | 90 ++++++++-------- drivers/staging/vt6655/channel.c | 10 +- drivers/staging/vt6655/device.h | 6 +- drivers/staging/vt6655/device_main.c | 150 +++++++++++++-------------- drivers/staging/vt6655/mac.c | 46 ++++---- drivers/staging/vt6655/power.c | 24 ++--- drivers/staging/vt6655/rf.c | 12 +-- drivers/staging/vt6655/rxtx.c | 12 +-- 9 files changed, 204 insertions(+), 204 deletions(-) -- 2.25.1 ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH v2 1/3] staging: vt6655: replace camel case b_short_slot_time instead of bShortSlotTime. 2021-09-24 20:59 ` Tommaso Merciai @ 2021-09-24 21:00 ` Tommaso Merciai -1 siblings, 0 replies; 13+ messages in thread From: Tommaso Merciai @ 2021-09-24 21:00 UTC (permalink / raw) Cc: tomm.merciai, Forest Bond, Greg Kroah-Hartman, Yujia Qiao, Lucas Henneman, Madhumitha Prabakaran, Marcos Antonio de Jesus Filho, Aldas Taraškevičius, Gustavo A. R. Silva, Deepak R Varma, linux-staging, linux-kernel Signed-off-by: Tommaso Merciai <tomm.merciai@gmail.com> --- drivers/staging/vt6655/baseband.c | 4 ++-- drivers/staging/vt6655/card.c | 2 +- drivers/staging/vt6655/device.h | 2 +- drivers/staging/vt6655/device_main.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/staging/vt6655/baseband.c b/drivers/staging/vt6655/baseband.c index f73f3fad3e05..170c4056946f 100644 --- a/drivers/staging/vt6655/baseband.c +++ b/drivers/staging/vt6655/baseband.c @@ -2200,7 +2200,7 @@ bb_set_short_slot_time(struct vnt_private *priv) bb_read_embedded(priv, 0x0A, &by_bb_rx_conf); /* CR10 */ - if (priv->bShortSlotTime) + if (priv->b_short_slot_time) by_bb_rx_conf &= 0xDF; /* 1101 1111 */ else by_bb_rx_conf |= 0x20; /* 0010 0000 */ @@ -2223,7 +2223,7 @@ void bb_set_vga_gain_offset(struct vnt_private *priv, unsigned char by_data) /* patch for 3253B0 Baseband with Cardbus module */ if (by_data == priv->abyBBVGA[0]) by_bb_rx_conf |= 0x20; /* 0010 0000 */ - else if (priv->bShortSlotTime) + else if (priv->b_short_slot_time) by_bb_rx_conf &= 0xDF; /* 1101 1111 */ else by_bb_rx_conf |= 0x20; /* 0010 0000 */ diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c index 3ef3a6e0e6e1..7a08ea0c7692 100644 --- a/drivers/staging/vt6655/card.c +++ b/drivers/staging/vt6655/card.c @@ -258,7 +258,7 @@ bool CARDbSetPhyParameter(struct vnt_private *priv, u8 bb_type) bb_write_embedded(priv, 0x88, 0x08); bySIFS = C_SIFS_BG; - if (priv->bShortSlotTime) { + if (priv->b_short_slot_time) { bySlot = C_SLOT_SHORT; byDIFS = C_SIFS_BG + 2 * C_SLOT_SHORT; } else { diff --git a/drivers/staging/vt6655/device.h b/drivers/staging/vt6655/device.h index 2af769174e33..63aa62e483c8 100644 --- a/drivers/staging/vt6655/device.h +++ b/drivers/staging/vt6655/device.h @@ -215,7 +215,7 @@ struct vnt_private { bool bEncryptionEnable; bool bLongHeader; - bool bShortSlotTime; + bool b_short_slot_time; bool bProtectMode; bool bNonERPPresent; bool bBarkerPreambleMd; diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index d40c2ac14928..8ae0fbfd134f 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -1440,9 +1440,9 @@ static void vnt_bss_info_changed(struct ieee80211_hw *hw, if (changed & BSS_CHANGED_ERP_SLOT) { if (conf->use_short_slot) - priv->bShortSlotTime = true; + priv->b_short_slot_time = true; else - priv->bShortSlotTime = false; + priv->b_short_slot_time = false; CARDbSetPhyParameter(priv, priv->byBBType); bb_set_vga_gain_offset(priv, priv->abyBBVGA[0]); -- 2.25.1 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH v2 1/3] staging: vt6655: replace camel case b_short_slot_time instead of bShortSlotTime. @ 2021-09-24 21:00 ` Tommaso Merciai 0 siblings, 0 replies; 13+ messages in thread From: Tommaso Merciai @ 2021-09-24 21:00 UTC (permalink / raw) Cc: tomm.merciai, Forest Bond, Greg Kroah-Hartman, Yujia Qiao, Lucas Henneman, Madhumitha Prabakaran, Marcos Antonio de Jesus Filho, Aldas Taraškevičius, Gustavo A. R. Silva, Deepak R Varma, linux-staging, linux-kernel Signed-off-by: Tommaso Merciai <tomm.merciai@gmail.com> --- drivers/staging/vt6655/baseband.c | 4 ++-- drivers/staging/vt6655/card.c | 2 +- drivers/staging/vt6655/device.h | 2 +- drivers/staging/vt6655/device_main.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/staging/vt6655/baseband.c b/drivers/staging/vt6655/baseband.c index f73f3fad3e05..170c4056946f 100644 --- a/drivers/staging/vt6655/baseband.c +++ b/drivers/staging/vt6655/baseband.c @@ -2200,7 +2200,7 @@ bb_set_short_slot_time(struct vnt_private *priv) bb_read_embedded(priv, 0x0A, &by_bb_rx_conf); /* CR10 */ - if (priv->bShortSlotTime) + if (priv->b_short_slot_time) by_bb_rx_conf &= 0xDF; /* 1101 1111 */ else by_bb_rx_conf |= 0x20; /* 0010 0000 */ @@ -2223,7 +2223,7 @@ void bb_set_vga_gain_offset(struct vnt_private *priv, unsigned char by_data) /* patch for 3253B0 Baseband with Cardbus module */ if (by_data == priv->abyBBVGA[0]) by_bb_rx_conf |= 0x20; /* 0010 0000 */ - else if (priv->bShortSlotTime) + else if (priv->b_short_slot_time) by_bb_rx_conf &= 0xDF; /* 1101 1111 */ else by_bb_rx_conf |= 0x20; /* 0010 0000 */ diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c index 3ef3a6e0e6e1..7a08ea0c7692 100644 --- a/drivers/staging/vt6655/card.c +++ b/drivers/staging/vt6655/card.c @@ -258,7 +258,7 @@ bool CARDbSetPhyParameter(struct vnt_private *priv, u8 bb_type) bb_write_embedded(priv, 0x88, 0x08); bySIFS = C_SIFS_BG; - if (priv->bShortSlotTime) { + if (priv->b_short_slot_time) { bySlot = C_SLOT_SHORT; byDIFS = C_SIFS_BG + 2 * C_SLOT_SHORT; } else { diff --git a/drivers/staging/vt6655/device.h b/drivers/staging/vt6655/device.h index 2af769174e33..63aa62e483c8 100644 --- a/drivers/staging/vt6655/device.h +++ b/drivers/staging/vt6655/device.h @@ -215,7 +215,7 @@ struct vnt_private { bool bEncryptionEnable; bool bLongHeader; - bool bShortSlotTime; + bool b_short_slot_time; bool bProtectMode; bool bNonERPPresent; bool bBarkerPreambleMd; diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index d40c2ac14928..8ae0fbfd134f 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -1440,9 +1440,9 @@ static void vnt_bss_info_changed(struct ieee80211_hw *hw, if (changed & BSS_CHANGED_ERP_SLOT) { if (conf->use_short_slot) - priv->bShortSlotTime = true; + priv->b_short_slot_time = true; else - priv->bShortSlotTime = false; + priv->b_short_slot_time = false; CARDbSetPhyParameter(priv, priv->byBBType); bb_set_vga_gain_offset(priv, priv->abyBBVGA[0]); -- 2.25.1 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH v2 1/3] staging: vt6655: replace camel case b_short_slot_time instead of bShortSlotTime. 2021-09-24 21:00 ` Tommaso Merciai (?) @ 2021-09-25 6:16 ` Greg Kroah-Hartman -1 siblings, 0 replies; 13+ messages in thread From: Greg Kroah-Hartman @ 2021-09-25 6:16 UTC (permalink / raw) To: Tommaso Merciai Cc: Forest Bond, Yujia Qiao, Lucas Henneman, Madhumitha Prabakaran, Marcos Antonio de Jesus Filho, Aldas Taraškevičius, Gustavo A. R. Silva, Deepak R Varma, linux-staging, linux-kernel On Fri, Sep 24, 2021 at 11:00:00PM +0200, Tommaso Merciai wrote: > Signed-off-by: Tommaso Merciai <tomm.merciai@gmail.com> Hi, This is the friendly patch-bot of Greg Kroah-Hartman. You have sent him a patch that has triggered this response. He used to manually respond to these common problems, but in order to save his sanity (he kept writing the same thing over and over, yet to different people), I was created. Hopefully you will not take offence and will fix the problem in your patch and resubmit it so that it can be accepted into the Linux kernel tree. You are receiving this message because of the following common error(s) as indicated below: - You did not write a descriptive Subject: for the patch, allowing Greg, and everyone else, to know what this patch is all about. Please read the section entitled "The canonical patch format" in the kernel file, Documentation/SubmittingPatches for what a proper Subject: line should look like. - This looks like a new version of a previously submitted patch, but you did not list below the --- line any changes from the previous version. Please read the section entitled "The canonical patch format" in the kernel file, Documentation/SubmittingPatches for what needs to be done here to properly describe this. If you wish to discuss this problem further, or you have questions about how to resolve this issue, please feel free to respond to this email and Greg will reply once he has dug out from the pending patches received from other developers. thanks, greg k-h's patch email bot ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH v2 2/3] staging: vt6655: replace camel case ld_bm_threshold instead of ldBmThreshold. 2021-09-24 20:59 ` Tommaso Merciai @ 2021-09-24 21:00 ` Tommaso Merciai -1 siblings, 0 replies; 13+ messages in thread From: Tommaso Merciai @ 2021-09-24 21:00 UTC (permalink / raw) Cc: tomm.merciai, Forest Bond, Greg Kroah-Hartman, Yujia Qiao, Madhumitha Prabakaran, Lucas Henneman, Aldas Taraškevičius, Gustavo A. R. Silva, Deepak R Varma, Marcos Antonio de Jesus Filho, linux-staging, linux-kernel Signed-off-by: Tommaso Merciai <tomm.merciai@gmail.com> --- drivers/staging/vt6655/baseband.c | 48 ++++++++++++++-------------- drivers/staging/vt6655/device.h | 2 +- drivers/staging/vt6655/device_main.c | 2 +- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/drivers/staging/vt6655/baseband.c b/drivers/staging/vt6655/baseband.c index 170c4056946f..55bddbda50cd 100644 --- a/drivers/staging/vt6655/baseband.c +++ b/drivers/staging/vt6655/baseband.c @@ -2021,10 +2021,10 @@ bool bb_vt3253_init(struct vnt_private *priv) priv->abyBBVGA[1] = 0x0A; priv->abyBBVGA[2] = 0x0; priv->abyBBVGA[3] = 0x0; - priv->ldBmThreshold[0] = -70; - priv->ldBmThreshold[1] = -50; - priv->ldBmThreshold[2] = 0; - priv->ldBmThreshold[3] = 0; + priv->ld_bm_threshold[0] = -70; + priv->ld_bm_threshold[1] = -50; + priv->ld_bm_threshold[2] = 0; + priv->ld_bm_threshold[3] = 0; } else if ((by_rf_type == RF_AIROHA) || (by_rf_type == RF_AL2230S)) { for (ii = 0; ii < CB_VT3253B0_INIT_FOR_AIROHA2230; ii++) result &= bb_write_embedded(priv, @@ -2039,10 +2039,10 @@ bool bb_vt3253_init(struct vnt_private *priv) priv->abyBBVGA[1] = 0x10; priv->abyBBVGA[2] = 0x0; priv->abyBBVGA[3] = 0x0; - priv->ldBmThreshold[0] = -70; - priv->ldBmThreshold[1] = -48; - priv->ldBmThreshold[2] = 0; - priv->ldBmThreshold[3] = 0; + priv->ld_bm_threshold[0] = -70; + priv->ld_bm_threshold[1] = -48; + priv->ld_bm_threshold[2] = 0; + priv->ld_bm_threshold[3] = 0; } else if (by_rf_type == RF_UW2451) { for (ii = 0; ii < CB_VT3253B0_INIT_FOR_UW2451; ii++) result &= bb_write_embedded(priv, @@ -2061,10 +2061,10 @@ bool bb_vt3253_init(struct vnt_private *priv) priv->abyBBVGA[1] = 0x0A; priv->abyBBVGA[2] = 0x0; priv->abyBBVGA[3] = 0x0; - priv->ldBmThreshold[0] = -60; - priv->ldBmThreshold[1] = -50; - priv->ldBmThreshold[2] = 0; - priv->ldBmThreshold[3] = 0; + priv->ld_bm_threshold[0] = -60; + priv->ld_bm_threshold[1] = -50; + priv->ld_bm_threshold[2] = 0; + priv->ld_bm_threshold[3] = 0; } else if (by_rf_type == RF_UW2452) { for (ii = 0; ii < CB_VT3253B0_INIT_FOR_UW2451; ii++) result &= bb_write_embedded(priv, @@ -2107,10 +2107,10 @@ bool bb_vt3253_init(struct vnt_private *priv) priv->abyBBVGA[1] = 0x0A; priv->abyBBVGA[2] = 0x0; priv->abyBBVGA[3] = 0x0; - priv->ldBmThreshold[0] = -60; - priv->ldBmThreshold[1] = -50; - priv->ldBmThreshold[2] = 0; - priv->ldBmThreshold[3] = 0; + priv->ld_bm_threshold[0] = -60; + priv->ld_bm_threshold[1] = -50; + priv->ld_bm_threshold[2] = 0; + priv->ld_bm_threshold[3] = 0; /* }} RobertYu */ } else if (by_rf_type == RF_VT3226) { @@ -2127,10 +2127,10 @@ bool bb_vt3253_init(struct vnt_private *priv) priv->abyBBVGA[1] = 0x10; priv->abyBBVGA[2] = 0x0; priv->abyBBVGA[3] = 0x0; - priv->ldBmThreshold[0] = -70; - priv->ldBmThreshold[1] = -48; - priv->ldBmThreshold[2] = 0; - priv->ldBmThreshold[3] = 0; + priv->ld_bm_threshold[0] = -70; + priv->ld_bm_threshold[1] = -48; + priv->ld_bm_threshold[2] = 0; + priv->ld_bm_threshold[3] = 0; /* Fix VT3226 DFC system timing issue */ MACvSetRFLE_LatchBase(iobase); /* {{ RobertYu: 20050104 */ @@ -2161,10 +2161,10 @@ bool bb_vt3253_init(struct vnt_private *priv) priv->abyBBVGA[1] = 0x10; priv->abyBBVGA[2] = 0x0; priv->abyBBVGA[3] = 0x0; - priv->ldBmThreshold[0] = -70; - priv->ldBmThreshold[1] = -48; - priv->ldBmThreshold[2] = 0; - priv->ldBmThreshold[3] = 0; + priv->ld_bm_threshold[0] = -70; + priv->ld_bm_threshold[1] = -48; + priv->ld_bm_threshold[2] = 0; + priv->ld_bm_threshold[3] = 0; /* }} RobertYu */ } else { /* No VGA Table now */ diff --git a/drivers/staging/vt6655/device.h b/drivers/staging/vt6655/device.h index 63aa62e483c8..876472862520 100644 --- a/drivers/staging/vt6655/device.h +++ b/drivers/staging/vt6655/device.h @@ -253,7 +253,7 @@ struct vnt_private { unsigned char byBBVGANew; unsigned char byBBVGACurrent; unsigned char abyBBVGA[BB_VGA_LEVEL]; - long ldBmThreshold[BB_VGA_LEVEL]; + long ld_bm_threshold[BB_VGA_LEVEL]; unsigned char byBBPreEDRSSI; unsigned char byBBPreEDIndex; diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index 8ae0fbfd134f..c4384b232c33 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -986,7 +986,7 @@ static void vnt_check_bb_vga(struct vnt_private *priv) RFvRSSITodBm(priv, (u8)priv->uCurrRSSI, &dbm); for (i = 0; i < BB_VGA_LEVEL; i++) { - if (dbm < priv->ldBmThreshold[i]) { + if (dbm < priv->ld_bm_threshold[i]) { priv->byBBVGANew = priv->abyBBVGA[i]; break; } -- 2.25.1 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH v2 2/3] staging: vt6655: replace camel case ld_bm_threshold instead of ldBmThreshold. @ 2021-09-24 21:00 ` Tommaso Merciai 0 siblings, 0 replies; 13+ messages in thread From: Tommaso Merciai @ 2021-09-24 21:00 UTC (permalink / raw) Cc: tomm.merciai, Forest Bond, Greg Kroah-Hartman, Yujia Qiao, Madhumitha Prabakaran, Lucas Henneman, Aldas Taraškevičius, Gustavo A. R. Silva, Deepak R Varma, Marcos Antonio de Jesus Filho, linux-staging, linux-kernel Signed-off-by: Tommaso Merciai <tomm.merciai@gmail.com> --- drivers/staging/vt6655/baseband.c | 48 ++++++++++++++-------------- drivers/staging/vt6655/device.h | 2 +- drivers/staging/vt6655/device_main.c | 2 +- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/drivers/staging/vt6655/baseband.c b/drivers/staging/vt6655/baseband.c index 170c4056946f..55bddbda50cd 100644 --- a/drivers/staging/vt6655/baseband.c +++ b/drivers/staging/vt6655/baseband.c @@ -2021,10 +2021,10 @@ bool bb_vt3253_init(struct vnt_private *priv) priv->abyBBVGA[1] = 0x0A; priv->abyBBVGA[2] = 0x0; priv->abyBBVGA[3] = 0x0; - priv->ldBmThreshold[0] = -70; - priv->ldBmThreshold[1] = -50; - priv->ldBmThreshold[2] = 0; - priv->ldBmThreshold[3] = 0; + priv->ld_bm_threshold[0] = -70; + priv->ld_bm_threshold[1] = -50; + priv->ld_bm_threshold[2] = 0; + priv->ld_bm_threshold[3] = 0; } else if ((by_rf_type == RF_AIROHA) || (by_rf_type == RF_AL2230S)) { for (ii = 0; ii < CB_VT3253B0_INIT_FOR_AIROHA2230; ii++) result &= bb_write_embedded(priv, @@ -2039,10 +2039,10 @@ bool bb_vt3253_init(struct vnt_private *priv) priv->abyBBVGA[1] = 0x10; priv->abyBBVGA[2] = 0x0; priv->abyBBVGA[3] = 0x0; - priv->ldBmThreshold[0] = -70; - priv->ldBmThreshold[1] = -48; - priv->ldBmThreshold[2] = 0; - priv->ldBmThreshold[3] = 0; + priv->ld_bm_threshold[0] = -70; + priv->ld_bm_threshold[1] = -48; + priv->ld_bm_threshold[2] = 0; + priv->ld_bm_threshold[3] = 0; } else if (by_rf_type == RF_UW2451) { for (ii = 0; ii < CB_VT3253B0_INIT_FOR_UW2451; ii++) result &= bb_write_embedded(priv, @@ -2061,10 +2061,10 @@ bool bb_vt3253_init(struct vnt_private *priv) priv->abyBBVGA[1] = 0x0A; priv->abyBBVGA[2] = 0x0; priv->abyBBVGA[3] = 0x0; - priv->ldBmThreshold[0] = -60; - priv->ldBmThreshold[1] = -50; - priv->ldBmThreshold[2] = 0; - priv->ldBmThreshold[3] = 0; + priv->ld_bm_threshold[0] = -60; + priv->ld_bm_threshold[1] = -50; + priv->ld_bm_threshold[2] = 0; + priv->ld_bm_threshold[3] = 0; } else if (by_rf_type == RF_UW2452) { for (ii = 0; ii < CB_VT3253B0_INIT_FOR_UW2451; ii++) result &= bb_write_embedded(priv, @@ -2107,10 +2107,10 @@ bool bb_vt3253_init(struct vnt_private *priv) priv->abyBBVGA[1] = 0x0A; priv->abyBBVGA[2] = 0x0; priv->abyBBVGA[3] = 0x0; - priv->ldBmThreshold[0] = -60; - priv->ldBmThreshold[1] = -50; - priv->ldBmThreshold[2] = 0; - priv->ldBmThreshold[3] = 0; + priv->ld_bm_threshold[0] = -60; + priv->ld_bm_threshold[1] = -50; + priv->ld_bm_threshold[2] = 0; + priv->ld_bm_threshold[3] = 0; /* }} RobertYu */ } else if (by_rf_type == RF_VT3226) { @@ -2127,10 +2127,10 @@ bool bb_vt3253_init(struct vnt_private *priv) priv->abyBBVGA[1] = 0x10; priv->abyBBVGA[2] = 0x0; priv->abyBBVGA[3] = 0x0; - priv->ldBmThreshold[0] = -70; - priv->ldBmThreshold[1] = -48; - priv->ldBmThreshold[2] = 0; - priv->ldBmThreshold[3] = 0; + priv->ld_bm_threshold[0] = -70; + priv->ld_bm_threshold[1] = -48; + priv->ld_bm_threshold[2] = 0; + priv->ld_bm_threshold[3] = 0; /* Fix VT3226 DFC system timing issue */ MACvSetRFLE_LatchBase(iobase); /* {{ RobertYu: 20050104 */ @@ -2161,10 +2161,10 @@ bool bb_vt3253_init(struct vnt_private *priv) priv->abyBBVGA[1] = 0x10; priv->abyBBVGA[2] = 0x0; priv->abyBBVGA[3] = 0x0; - priv->ldBmThreshold[0] = -70; - priv->ldBmThreshold[1] = -48; - priv->ldBmThreshold[2] = 0; - priv->ldBmThreshold[3] = 0; + priv->ld_bm_threshold[0] = -70; + priv->ld_bm_threshold[1] = -48; + priv->ld_bm_threshold[2] = 0; + priv->ld_bm_threshold[3] = 0; /* }} RobertYu */ } else { /* No VGA Table now */ diff --git a/drivers/staging/vt6655/device.h b/drivers/staging/vt6655/device.h index 63aa62e483c8..876472862520 100644 --- a/drivers/staging/vt6655/device.h +++ b/drivers/staging/vt6655/device.h @@ -253,7 +253,7 @@ struct vnt_private { unsigned char byBBVGANew; unsigned char byBBVGACurrent; unsigned char abyBBVGA[BB_VGA_LEVEL]; - long ldBmThreshold[BB_VGA_LEVEL]; + long ld_bm_threshold[BB_VGA_LEVEL]; unsigned char byBBPreEDRSSI; unsigned char byBBPreEDIndex; diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index 8ae0fbfd134f..c4384b232c33 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -986,7 +986,7 @@ static void vnt_check_bb_vga(struct vnt_private *priv) RFvRSSITodBm(priv, (u8)priv->uCurrRSSI, &dbm); for (i = 0; i < BB_VGA_LEVEL; i++) { - if (dbm < priv->ldBmThreshold[i]) { + if (dbm < priv->ld_bm_threshold[i]) { priv->byBBVGANew = priv->abyBBVGA[i]; break; } -- 2.25.1 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH v2 3/3] staging: vt6655: replace camel case port_offset instead of PortOffset. 2021-09-24 20:59 ` Tommaso Merciai @ 2021-09-24 21:00 ` Tommaso Merciai -1 siblings, 0 replies; 13+ messages in thread From: Tommaso Merciai @ 2021-09-24 21:00 UTC (permalink / raw) Cc: tomm.merciai, Forest Bond, Greg Kroah-Hartman, Madhumitha Prabakaran, Yujia Qiao, Lucas Henneman, Marcos Antonio de Jesus Filho, Edmundo Carmona Antoranz, Aldas Taraškevičius, Gustavo A. R. Silva, Deepak R Varma, linux-staging, linux-kernel Signed-off-by: Tommaso Merciai <tomm.merciai@gmail.com> --- drivers/staging/vt6655/baseband.c | 6 +- drivers/staging/vt6655/card.c | 88 ++++++++-------- drivers/staging/vt6655/channel.c | 10 +- drivers/staging/vt6655/device.h | 2 +- drivers/staging/vt6655/device_main.c | 144 +++++++++++++-------------- drivers/staging/vt6655/mac.c | 46 ++++----- drivers/staging/vt6655/power.c | 24 ++--- drivers/staging/vt6655/rf.c | 12 +-- drivers/staging/vt6655/rxtx.c | 12 +-- 9 files changed, 172 insertions(+), 172 deletions(-) diff --git a/drivers/staging/vt6655/baseband.c b/drivers/staging/vt6655/baseband.c index 55bddbda50cd..c51c3ef8546a 100644 --- a/drivers/staging/vt6655/baseband.c +++ b/drivers/staging/vt6655/baseband.c @@ -1905,7 +1905,7 @@ void vnt_get_phy_field(struct vnt_private *priv, u32 frame_length, bool bb_read_embedded(struct vnt_private *priv, unsigned char by_bb_addr, unsigned char *pby_data) { - void __iomem *iobase = priv->PortOffset; + void __iomem *iobase = priv->port_offset; unsigned short ww; unsigned char by_value; @@ -1948,7 +1948,7 @@ bool bb_read_embedded(struct vnt_private *priv, unsigned char by_bb_addr, bool bb_write_embedded(struct vnt_private *priv, unsigned char by_bb_addr, unsigned char by_data) { - void __iomem *iobase = priv->PortOffset; + void __iomem *iobase = priv->port_offset; unsigned short ww; unsigned char by_value; @@ -1992,7 +1992,7 @@ bool bb_vt3253_init(struct vnt_private *priv) { bool result = true; int ii; - void __iomem *iobase = priv->PortOffset; + void __iomem *iobase = priv->port_offset; unsigned char by_rf_type = priv->byRFType; unsigned char by_local_id = priv->byLocalID; diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c index 7a08ea0c7692..4764dfaf243a 100644 --- a/drivers/staging/vt6655/card.c +++ b/drivers/staging/vt6655/card.c @@ -190,7 +190,7 @@ bool CARDbSetPhyParameter(struct vnt_private *priv, u8 bb_type) if (bb_type == BB_TYPE_11A) { if (priv->byRFType == RF_AIROHA7230) { /* AL7230 use single PAPE and connect to PAPE_2.4G */ - MACvSetBBType(priv->PortOffset, BB_TYPE_11G); + MACvSetBBType(priv->port_offset, BB_TYPE_11G); priv->abyBBVGA[0] = 0x20; priv->abyBBVGA[2] = 0x10; priv->abyBBVGA[3] = 0x10; @@ -199,7 +199,7 @@ bool CARDbSetPhyParameter(struct vnt_private *priv, u8 bb_type) bb_write_embedded(priv, 0xE7, priv->abyBBVGA[0]); } else if (priv->byRFType == RF_UW2452) { - MACvSetBBType(priv->PortOffset, BB_TYPE_11A); + MACvSetBBType(priv->port_offset, BB_TYPE_11A); priv->abyBBVGA[0] = 0x18; bb_read_embedded(priv, 0xE7, &byData); if (byData == 0x14) { @@ -207,7 +207,7 @@ bool CARDbSetPhyParameter(struct vnt_private *priv, u8 bb_type) bb_write_embedded(priv, 0xE1, 0x57); } } else { - MACvSetBBType(priv->PortOffset, BB_TYPE_11A); + MACvSetBBType(priv->port_offset, BB_TYPE_11A); } bb_write_embedded(priv, 0x88, 0x03); bySlot = C_SLOT_SHORT; @@ -215,7 +215,7 @@ bool CARDbSetPhyParameter(struct vnt_private *priv, u8 bb_type) byDIFS = C_SIFS_A + 2 * C_SLOT_SHORT; byCWMaxMin = 0xA4; } else if (bb_type == BB_TYPE_11B) { - MACvSetBBType(priv->PortOffset, BB_TYPE_11B); + MACvSetBBType(priv->port_offset, BB_TYPE_11B); if (priv->byRFType == RF_AIROHA7230) { priv->abyBBVGA[0] = 0x1C; priv->abyBBVGA[2] = 0x00; @@ -238,7 +238,7 @@ bool CARDbSetPhyParameter(struct vnt_private *priv, u8 bb_type) byDIFS = C_SIFS_BG + 2 * C_SLOT_LONG; byCWMaxMin = 0xA5; } else { /* PK_TYPE_11GA & PK_TYPE_11GB */ - MACvSetBBType(priv->PortOffset, BB_TYPE_11G); + MACvSetBBType(priv->port_offset, BB_TYPE_11G); if (priv->byRFType == RF_AIROHA7230) { priv->abyBBVGA[0] = 0x1C; priv->abyBBVGA[2] = 0x00; @@ -292,25 +292,25 @@ bool CARDbSetPhyParameter(struct vnt_private *priv, u8 bb_type) if (priv->bySIFS != bySIFS) { priv->bySIFS = bySIFS; - VNSvOutPortB(priv->PortOffset + MAC_REG_SIFS, priv->bySIFS); + VNSvOutPortB(priv->port_offset + MAC_REG_SIFS, priv->bySIFS); } if (priv->byDIFS != byDIFS) { priv->byDIFS = byDIFS; - VNSvOutPortB(priv->PortOffset + MAC_REG_DIFS, priv->byDIFS); + VNSvOutPortB(priv->port_offset + MAC_REG_DIFS, priv->byDIFS); } if (priv->byEIFS != C_EIFS) { priv->byEIFS = C_EIFS; - VNSvOutPortB(priv->PortOffset + MAC_REG_EIFS, priv->byEIFS); + VNSvOutPortB(priv->port_offset + MAC_REG_EIFS, priv->byEIFS); } if (priv->bySlot != bySlot) { priv->bySlot = bySlot; - VNSvOutPortB(priv->PortOffset + MAC_REG_SLOT, priv->bySlot); + VNSvOutPortB(priv->port_offset + MAC_REG_SLOT, priv->bySlot); bb_set_short_slot_time(priv); } if (priv->byCWMaxMin != byCWMaxMin) { priv->byCWMaxMin = byCWMaxMin; - VNSvOutPortB(priv->PortOffset + MAC_REG_CWMAXMIN0, + VNSvOutPortB(priv->port_offset + MAC_REG_CWMAXMIN0, priv->byCWMaxMin); } @@ -348,11 +348,11 @@ bool CARDbUpdateTSF(struct vnt_private *priv, unsigned char byRxRate, qwTSFOffset = CARDqGetTSFOffset(byRxRate, qwBSSTimestamp, local_tsf); /* adjust TSF, HW's TSF add TSF Offset reg */ - VNSvOutPortD(priv->PortOffset + MAC_REG_TSFOFST, + VNSvOutPortD(priv->port_offset + MAC_REG_TSFOFST, (u32)qwTSFOffset); - VNSvOutPortD(priv->PortOffset + MAC_REG_TSFOFST + 4, + VNSvOutPortD(priv->port_offset + MAC_REG_TSFOFST + 4, (u32)(qwTSFOffset >> 32)); - MACvRegBitsOn(priv->PortOffset, MAC_REG_TFTCTL, + MACvRegBitsOn(priv->port_offset, MAC_REG_TFTCTL, TFTCTL_TSFSYNCEN); } return true; @@ -381,13 +381,13 @@ bool CARDbSetBeaconPeriod(struct vnt_private *priv, qwNextTBTT = CARDqGetNextTBTT(qwNextTBTT, wBeaconInterval); /* set HW beacon interval */ - VNSvOutPortW(priv->PortOffset + MAC_REG_BI, wBeaconInterval); + VNSvOutPortW(priv->port_offset + MAC_REG_BI, wBeaconInterval); priv->wBeaconInterval = wBeaconInterval; /* Set NextTBTT */ - VNSvOutPortD(priv->PortOffset + MAC_REG_NEXTTBTT, (u32)qwNextTBTT); - VNSvOutPortD(priv->PortOffset + MAC_REG_NEXTTBTT + 4, + VNSvOutPortD(priv->port_offset + MAC_REG_NEXTTBTT, (u32)qwNextTBTT); + VNSvOutPortD(priv->port_offset + MAC_REG_NEXTTBTT + 4, (u32)(qwNextTBTT >> 32)); - MACvRegBitsOn(priv->PortOffset, MAC_REG_TFTCTL, TFTCTL_TBTTSYNCEN); + MACvRegBitsOn(priv->port_offset, MAC_REG_TFTCTL, TFTCTL_TBTTSYNCEN); return true; } @@ -409,29 +409,29 @@ void CARDbRadioPowerOff(struct vnt_private *priv) switch (priv->byRFType) { case RF_RFMD2959: - MACvWordRegBitsOff(priv->PortOffset, MAC_REG_SOFTPWRCTL, + MACvWordRegBitsOff(priv->port_offset, MAC_REG_SOFTPWRCTL, SOFTPWRCTL_TXPEINV); - MACvWordRegBitsOn(priv->PortOffset, MAC_REG_SOFTPWRCTL, + MACvWordRegBitsOn(priv->port_offset, MAC_REG_SOFTPWRCTL, SOFTPWRCTL_SWPE1); break; case RF_AIROHA: case RF_AL2230S: case RF_AIROHA7230: - MACvWordRegBitsOff(priv->PortOffset, MAC_REG_SOFTPWRCTL, + MACvWordRegBitsOff(priv->port_offset, MAC_REG_SOFTPWRCTL, SOFTPWRCTL_SWPE2); - MACvWordRegBitsOff(priv->PortOffset, MAC_REG_SOFTPWRCTL, + MACvWordRegBitsOff(priv->port_offset, MAC_REG_SOFTPWRCTL, SOFTPWRCTL_SWPE3); break; } - MACvRegBitsOff(priv->PortOffset, MAC_REG_HOSTCR, HOSTCR_RXON); + MACvRegBitsOff(priv->port_offset, MAC_REG_HOSTCR, HOSTCR_RXON); bb_set_deep_sleep(priv, priv->byLocalID); priv->bRadioOff = true; pr_debug("chester power off\n"); - MACvRegBitsOn(priv->PortOffset, MAC_REG_GPIOCTL0, + MACvRegBitsOn(priv->port_offset, MAC_REG_GPIOCTL0, LED_ACTSET); /* LED issue */ } @@ -467,7 +467,7 @@ void CARDvSafeResetTx(struct vnt_private *priv) MACvSetCurrTXDescAddr(TYPE_AC0DMA, priv, priv->td1_pool_dma); /* set MAC Beacon TX pointer */ - MACvSetCurrBCNTxDescAddr(priv->PortOffset, + MACvSetCurrBCNTxDescAddr(priv->port_offset, (priv->tx_beacon_dma)); } @@ -509,8 +509,8 @@ void CARDvSafeResetRx(struct vnt_private *priv) } /* set perPkt mode */ - MACvRx0PerPktMode(priv->PortOffset); - MACvRx1PerPktMode(priv->PortOffset); + MACvRx0PerPktMode(priv->port_offset); + MACvRx1PerPktMode(priv->port_offset); /* set MAC RD pointer */ MACvSetCurrRx0DescAddr(priv, priv->rd0_pool_dma); @@ -599,7 +599,7 @@ void CARDvSetRSPINF(struct vnt_private *priv, u8 bb_type) spin_lock_irqsave(&priv->lock, flags); /* Set to Page1 */ - MACvSelectPage1(priv->PortOffset); + MACvSelectPage1(priv->port_offset); /* RSPINF_b_1 */ vnt_get_phy_field(priv, 14, @@ -609,7 +609,7 @@ void CARDvSetRSPINF(struct vnt_private *priv, u8 bb_type) /* swap over to get correct write order */ swap(phy.swap[0], phy.swap[1]); - VNSvOutPortD(priv->PortOffset + MAC_REG_RSPINF_B_1, phy.field_write); + VNSvOutPortD(priv->port_offset + MAC_REG_RSPINF_B_1, phy.field_write); /* RSPINF_b_2 */ vnt_get_phy_field(priv, 14, @@ -618,7 +618,7 @@ void CARDvSetRSPINF(struct vnt_private *priv, u8 bb_type) swap(phy.swap[0], phy.swap[1]); - VNSvOutPortD(priv->PortOffset + MAC_REG_RSPINF_B_2, phy.field_write); + VNSvOutPortD(priv->port_offset + MAC_REG_RSPINF_B_2, phy.field_write); /* RSPINF_b_5 */ vnt_get_phy_field(priv, 14, @@ -627,7 +627,7 @@ void CARDvSetRSPINF(struct vnt_private *priv, u8 bb_type) swap(phy.swap[0], phy.swap[1]); - VNSvOutPortD(priv->PortOffset + MAC_REG_RSPINF_B_5, phy.field_write); + VNSvOutPortD(priv->port_offset + MAC_REG_RSPINF_B_5, phy.field_write); /* RSPINF_b_11 */ vnt_get_phy_field(priv, 14, @@ -636,42 +636,42 @@ void CARDvSetRSPINF(struct vnt_private *priv, u8 bb_type) swap(phy.swap[0], phy.swap[1]); - VNSvOutPortD(priv->PortOffset + MAC_REG_RSPINF_B_11, phy.field_write); + VNSvOutPortD(priv->port_offset + MAC_REG_RSPINF_B_11, phy.field_write); /* RSPINF_a_6 */ s_vCalculateOFDMRParameter(RATE_6M, bb_type, &byTxRate, &byRsvTime); - VNSvOutPortW(priv->PortOffset + MAC_REG_RSPINF_A_6, + VNSvOutPortW(priv->port_offset + MAC_REG_RSPINF_A_6, MAKEWORD(byTxRate, byRsvTime)); /* RSPINF_a_9 */ s_vCalculateOFDMRParameter(RATE_9M, bb_type, &byTxRate, &byRsvTime); - VNSvOutPortW(priv->PortOffset + MAC_REG_RSPINF_A_9, + VNSvOutPortW(priv->port_offset + MAC_REG_RSPINF_A_9, MAKEWORD(byTxRate, byRsvTime)); /* RSPINF_a_12 */ s_vCalculateOFDMRParameter(RATE_12M, bb_type, &byTxRate, &byRsvTime); - VNSvOutPortW(priv->PortOffset + MAC_REG_RSPINF_A_12, + VNSvOutPortW(priv->port_offset + MAC_REG_RSPINF_A_12, MAKEWORD(byTxRate, byRsvTime)); /* RSPINF_a_18 */ s_vCalculateOFDMRParameter(RATE_18M, bb_type, &byTxRate, &byRsvTime); - VNSvOutPortW(priv->PortOffset + MAC_REG_RSPINF_A_18, + VNSvOutPortW(priv->port_offset + MAC_REG_RSPINF_A_18, MAKEWORD(byTxRate, byRsvTime)); /* RSPINF_a_24 */ s_vCalculateOFDMRParameter(RATE_24M, bb_type, &byTxRate, &byRsvTime); - VNSvOutPortW(priv->PortOffset + MAC_REG_RSPINF_A_24, + VNSvOutPortW(priv->port_offset + MAC_REG_RSPINF_A_24, MAKEWORD(byTxRate, byRsvTime)); /* RSPINF_a_36 */ s_vCalculateOFDMRParameter(CARDwGetOFDMControlRate((void *)priv, @@ -679,7 +679,7 @@ void CARDvSetRSPINF(struct vnt_private *priv, u8 bb_type) bb_type, &byTxRate, &byRsvTime); - VNSvOutPortW(priv->PortOffset + MAC_REG_RSPINF_A_36, + VNSvOutPortW(priv->port_offset + MAC_REG_RSPINF_A_36, MAKEWORD(byTxRate, byRsvTime)); /* RSPINF_a_48 */ s_vCalculateOFDMRParameter(CARDwGetOFDMControlRate((void *)priv, @@ -687,7 +687,7 @@ void CARDvSetRSPINF(struct vnt_private *priv, u8 bb_type) bb_type, &byTxRate, &byRsvTime); - VNSvOutPortW(priv->PortOffset + MAC_REG_RSPINF_A_48, + VNSvOutPortW(priv->port_offset + MAC_REG_RSPINF_A_48, MAKEWORD(byTxRate, byRsvTime)); /* RSPINF_a_54 */ s_vCalculateOFDMRParameter(CARDwGetOFDMControlRate((void *)priv, @@ -695,7 +695,7 @@ void CARDvSetRSPINF(struct vnt_private *priv, u8 bb_type) bb_type, &byTxRate, &byRsvTime); - VNSvOutPortW(priv->PortOffset + MAC_REG_RSPINF_A_54, + VNSvOutPortW(priv->port_offset + MAC_REG_RSPINF_A_54, MAKEWORD(byTxRate, byRsvTime)); /* RSPINF_a_72 */ s_vCalculateOFDMRParameter(CARDwGetOFDMControlRate((void *)priv, @@ -703,10 +703,10 @@ void CARDvSetRSPINF(struct vnt_private *priv, u8 bb_type) bb_type, &byTxRate, &byRsvTime); - VNSvOutPortW(priv->PortOffset + MAC_REG_RSPINF_A_72, + VNSvOutPortW(priv->port_offset + MAC_REG_RSPINF_A_72, MAKEWORD(byTxRate, byRsvTime)); /* Set to Page0 */ - MACvSelectPage0(priv->PortOffset); + MACvSelectPage0(priv->port_offset); spin_unlock_irqrestore(&priv->lock, flags); } @@ -796,7 +796,7 @@ u64 CARDqGetTSFOffset(unsigned char byRxRate, u64 qwTSF1, u64 qwTSF2) */ bool CARDbGetCurrentTSF(struct vnt_private *priv, u64 *pqwCurrTSF) { - void __iomem *iobase = priv->PortOffset; + void __iomem *iobase = priv->port_offset; unsigned short ww; unsigned char byData; @@ -857,7 +857,7 @@ u64 CARDqGetNextTBTT(u64 qwTSF, unsigned short wBeaconInterval) void CARDvSetFirstNextTBTT(struct vnt_private *priv, unsigned short wBeaconInterval) { - void __iomem *iobase = priv->PortOffset; + void __iomem *iobase = priv->port_offset; u64 qwNextTBTT = 0; CARDbGetCurrentTSF(priv, &qwNextTBTT); /* Get Local TSF counter */ @@ -886,7 +886,7 @@ void CARDvSetFirstNextTBTT(struct vnt_private *priv, void CARDvUpdateNextTBTT(struct vnt_private *priv, u64 qwTSF, unsigned short wBeaconInterval) { - void __iomem *iobase = priv->PortOffset; + void __iomem *iobase = priv->port_offset; qwTSF = CARDqGetNextTBTT(qwTSF, wBeaconInterval); /* Set NextTBTT */ diff --git a/drivers/staging/vt6655/channel.c b/drivers/staging/vt6655/channel.c index 52b6538a201a..76ee3146b865 100644 --- a/drivers/staging/vt6655/channel.c +++ b/drivers/staging/vt6655/channel.c @@ -173,7 +173,7 @@ bool set_channel(struct vnt_private *priv, struct ieee80211_channel *ch) } /* clear NAV */ - MACvRegBitsOn(priv->PortOffset, MAC_REG_MACCR, MACCR_CLRNAV); + MACvRegBitsOn(priv->port_offset, MAC_REG_MACCR, MACCR_CLRNAV); /* TX_PE will reserve 3 us for MAX2829 A mode only, * it is for better TX throughput @@ -199,14 +199,14 @@ bool set_channel(struct vnt_private *priv, struct ieee80211_channel *ch) spin_lock_irqsave(&priv->lock, flags); /* set HW default power register */ - MACvSelectPage1(priv->PortOffset); + MACvSelectPage1(priv->port_offset); RFbSetPower(priv, RATE_1M, priv->byCurrentCh); - VNSvOutPortB(priv->PortOffset + MAC_REG_PWRCCK, + VNSvOutPortB(priv->port_offset + MAC_REG_PWRCCK, priv->byCurPwr); RFbSetPower(priv, RATE_6M, priv->byCurrentCh); - VNSvOutPortB(priv->PortOffset + MAC_REG_PWROFDM, + VNSvOutPortB(priv->port_offset + MAC_REG_PWROFDM, priv->byCurPwr); - MACvSelectPage0(priv->PortOffset); + MACvSelectPage0(priv->port_offset); spin_unlock_irqrestore(&priv->lock, flags); } diff --git a/drivers/staging/vt6655/device.h b/drivers/staging/vt6655/device.h index 876472862520..5610a969dd13 100644 --- a/drivers/staging/vt6655/device.h +++ b/drivers/staging/vt6655/device.h @@ -124,7 +124,7 @@ struct vnt_private { unsigned char *tx1_bufs; unsigned char *tx_beacon_bufs; - void __iomem *PortOffset; + void __iomem *port_offset; u32 memaddr; u32 ioaddr; diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index c4384b232c33..ab7aa9a96ff3 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -219,11 +219,11 @@ static void device_init_registers(struct vnt_private *priv) MACvInitialize(priv); /* Get Local ID */ - VNSvInPortB(priv->PortOffset + MAC_REG_LOCALID, &priv->byLocalID); + VNSvInPortB(priv->port_offset + MAC_REG_LOCALID, &priv->byLocalID); spin_lock_irqsave(&priv->lock, flags); - SROMvReadAllContents(priv->PortOffset, priv->abyEEPROM); + SROMvReadAllContents(priv->port_offset, priv->abyEEPROM); spin_unlock_irqrestore(&priv->lock, flags); @@ -232,7 +232,7 @@ static void device_init_registers(struct vnt_private *priv) priv->byMaxChannel = CB_MAX_CHANNEL; /* Get Antena */ - byValue = SROMbyReadEmbedded(priv->PortOffset, EEP_OFS_ANTENNA); + byValue = SROMbyReadEmbedded(priv->port_offset, EEP_OFS_ANTENNA); if (byValue & EEP_ANTINV) priv->bTxRxAntInv = true; else @@ -292,20 +292,20 @@ static void device_init_registers(struct vnt_private *priv) /* Get Desire Power Value */ priv->byCurPwr = 0xFF; - priv->byCCKPwr = SROMbyReadEmbedded(priv->PortOffset, EEP_OFS_PWR_CCK); - priv->byOFDMPwrG = SROMbyReadEmbedded(priv->PortOffset, + priv->byCCKPwr = SROMbyReadEmbedded(priv->port_offset, EEP_OFS_PWR_CCK); + priv->byOFDMPwrG = SROMbyReadEmbedded(priv->port_offset, EEP_OFS_PWR_OFDMG); /* Load power Table */ for (ii = 0; ii < CB_MAX_CHANNEL_24G; ii++) { priv->abyCCKPwrTbl[ii + 1] = - SROMbyReadEmbedded(priv->PortOffset, + SROMbyReadEmbedded(priv->port_offset, (unsigned char)(ii + EEP_OFS_CCK_PWR_TBL)); if (priv->abyCCKPwrTbl[ii + 1] == 0) priv->abyCCKPwrTbl[ii + 1] = priv->byCCKPwr; priv->abyOFDMPwrTbl[ii + 1] = - SROMbyReadEmbedded(priv->PortOffset, + SROMbyReadEmbedded(priv->port_offset, (unsigned char)(ii + EEP_OFS_OFDM_PWR_TBL)); if (priv->abyOFDMPwrTbl[ii + 1] == 0) priv->abyOFDMPwrTbl[ii + 1] = priv->byOFDMPwrG; @@ -323,25 +323,25 @@ static void device_init_registers(struct vnt_private *priv) /* Load OFDM A Power Table */ for (ii = 0; ii < CB_MAX_CHANNEL_5G; ii++) { priv->abyOFDMPwrTbl[ii + CB_MAX_CHANNEL_24G + 1] = - SROMbyReadEmbedded(priv->PortOffset, + SROMbyReadEmbedded(priv->port_offset, (unsigned char)(ii + EEP_OFS_OFDMA_PWR_TBL)); priv->abyOFDMDefaultPwr[ii + CB_MAX_CHANNEL_24G + 1] = - SROMbyReadEmbedded(priv->PortOffset, + SROMbyReadEmbedded(priv->port_offset, (unsigned char)(ii + EEP_OFS_OFDMA_PWR_dBm)); } if (priv->byLocalID > REV_ID_VT3253_B1) { - MACvSelectPage1(priv->PortOffset); + MACvSelectPage1(priv->port_offset); - VNSvOutPortB(priv->PortOffset + MAC_REG_MSRCTL + 1, + VNSvOutPortB(priv->port_offset + MAC_REG_MSRCTL + 1, (MSRCTL1_TXPWR | MSRCTL1_CSAPAREN)); - MACvSelectPage0(priv->PortOffset); + MACvSelectPage0(priv->port_offset); } /* use relative tx timeout and 802.11i D4 */ - MACvWordRegBitsOn(priv->PortOffset, + MACvWordRegBitsOn(priv->port_offset, MAC_REG_CFG, (CFG_TKIPOPT | CFG_NOTXTIMEOUT)); /* set performance parameter by registry */ @@ -349,9 +349,9 @@ static void device_init_registers(struct vnt_private *priv) MACvSetLongRetryLimit(priv, priv->byLongRetryLimit); /* reset TSF counter */ - VNSvOutPortB(priv->PortOffset + MAC_REG_TFTCTL, TFTCTL_TSFCNTRST); + VNSvOutPortB(priv->port_offset + MAC_REG_TFTCTL, TFTCTL_TSFCNTRST); /* enable TSF counter */ - VNSvOutPortB(priv->PortOffset + MAC_REG_TFTCTL, TFTCTL_TSFCNTREN); + VNSvOutPortB(priv->port_offset + MAC_REG_TFTCTL, TFTCTL_TSFCNTREN); /* initialize BBP registers */ bb_vt3253_init(priv); @@ -371,13 +371,13 @@ static void device_init_registers(struct vnt_private *priv) priv->bRadioOff = false; - priv->byRadioCtl = SROMbyReadEmbedded(priv->PortOffset, + priv->byRadioCtl = SROMbyReadEmbedded(priv->port_offset, EEP_OFS_RADIOCTL); priv->bHWRadioOff = false; if (priv->byRadioCtl & EEP_RADIOCTL_ENABLE) { /* Get GPIO */ - MACvGPIOIn(priv->PortOffset, &priv->byGPIO); + MACvGPIOIn(priv->port_offset, &priv->byGPIO); if (((priv->byGPIO & GPIO0_DATA) && !(priv->byRadioCtl & EEP_RADIOCTL_INV)) || @@ -390,7 +390,7 @@ static void device_init_registers(struct vnt_private *priv) CARDbRadioPowerOff(priv); /* get Permanent network address */ - SROMvReadEtherAddress(priv->PortOffset, priv->abyCurrentNetAddr); + SROMvReadEtherAddress(priv->port_offset, priv->abyCurrentNetAddr); pr_debug("Network address = %pM\n", priv->abyCurrentNetAddr); /* reset Tx pointer */ @@ -399,21 +399,21 @@ static void device_init_registers(struct vnt_private *priv) CARDvSafeResetTx(priv); if (priv->byLocalID <= REV_ID_VT3253_A1) - MACvRegBitsOn(priv->PortOffset, MAC_REG_RCR, RCR_WPAERR); + MACvRegBitsOn(priv->port_offset, MAC_REG_RCR, RCR_WPAERR); /* Turn On Rx DMA */ - MACvReceive0(priv->PortOffset); - MACvReceive1(priv->PortOffset); + MACvReceive0(priv->port_offset); + MACvReceive1(priv->port_offset); /* start the adapter */ - MACvStart(priv->PortOffset); + MACvStart(priv->port_offset); } static void device_print_info(struct vnt_private *priv) { dev_info(&priv->pcid->dev, "MAC=%pM IO=0x%lx Mem=0x%lx IRQ=%d\n", priv->abyCurrentNetAddr, (unsigned long)priv->ioaddr, - (unsigned long)priv->PortOffset, priv->pcid->irq); + (unsigned long)priv->port_offset, priv->pcid->irq); } static void device_free_info(struct vnt_private *priv) @@ -424,8 +424,8 @@ static void device_free_info(struct vnt_private *priv) if (priv->mac_hw) ieee80211_unregister_hw(priv->hw); - if (priv->PortOffset) - iounmap(priv->PortOffset); + if (priv->port_offset) + iounmap(priv->port_offset); if (priv->pcid) pci_release_regions(priv->pcid); @@ -1029,7 +1029,7 @@ static void vnt_interrupt_process(struct vnt_private *priv) u32 isr; unsigned long flags; - MACvReadISR(priv->PortOffset, &isr); + MACvReadISR(priv->port_offset, &isr); if (isr == 0) return; @@ -1042,7 +1042,7 @@ static void vnt_interrupt_process(struct vnt_private *priv) spin_lock_irqsave(&priv->lock, flags); /* Read low level stats */ - MACvReadMIBCounter(priv->PortOffset, &mib_counter); + MACvReadMIBCounter(priv->port_offset, &mib_counter); low_stats->dot11RTSSuccessCount += mib_counter & 0xff; low_stats->dot11RTSFailureCount += (mib_counter >> 8) & 0xff; @@ -1056,12 +1056,12 @@ static void vnt_interrupt_process(struct vnt_private *priv) * update ISR counter */ while (isr && priv->vif) { - MACvWriteISR(priv->PortOffset, isr); + MACvWriteISR(priv->port_offset, isr); if (isr & ISR_FETALERR) { pr_debug(" ISR_FETALERR\n"); - VNSvOutPortB(priv->PortOffset + MAC_REG_SOFTPWRCTL, 0); - VNSvOutPortW(priv->PortOffset + + VNSvOutPortB(priv->port_offset + MAC_REG_SOFTPWRCTL, 0); + VNSvOutPortW(priv->port_offset + MAC_REG_SOFTPWRCTL, SOFTPWRCTL_SWPECTI); device_error(priv, isr); } @@ -1116,10 +1116,10 @@ static void vnt_interrupt_process(struct vnt_private *priv) ieee80211_queue_stopped(priv->hw, 0)) ieee80211_wake_queues(priv->hw); - MACvReadISR(priv->PortOffset, &isr); + MACvReadISR(priv->port_offset, &isr); - MACvReceive0(priv->PortOffset); - MACvReceive1(priv->PortOffset); + MACvReceive0(priv->port_offset); + MACvReceive1(priv->port_offset); if (max_count > priv->opts.int_works) break; @@ -1136,7 +1136,7 @@ static void vnt_interrupt_work(struct work_struct *work) if (priv->vif) vnt_interrupt_process(priv); - MACvIntEnable(priv->PortOffset, IMR_MASK_VALUE); + MACvIntEnable(priv->port_offset, IMR_MASK_VALUE); } static irqreturn_t vnt_interrupt(int irq, void *arg) @@ -1145,7 +1145,7 @@ static irqreturn_t vnt_interrupt(int irq, void *arg) schedule_work(&priv->interrupt_work); - MACvIntDisable(priv->PortOffset); + MACvIntDisable(priv->port_offset); return IRQ_HANDLED; } @@ -1201,9 +1201,9 @@ static int vnt_tx_packet(struct vnt_private *priv, struct sk_buff *skb) wmb(); /* second memory barrier */ if (head_td->td_info->flags & TD_FLAGS_NETIF_SKB) - MACvTransmitAC0(priv->PortOffset); + MACvTransmitAC0(priv->port_offset); else - MACvTransmit0(priv->PortOffset); + MACvTransmit0(priv->port_offset); priv->iTDUsed[dma_idx]++; @@ -1255,7 +1255,7 @@ static int vnt_start(struct ieee80211_hw *hw) device_init_registers(priv); dev_dbg(&priv->pcid->dev, "call MACvIntEnable\n"); - MACvIntEnable(priv->PortOffset, IMR_MASK_VALUE); + MACvIntEnable(priv->port_offset, IMR_MASK_VALUE); ieee80211_wake_queues(hw); @@ -1305,15 +1305,15 @@ static int vnt_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif) case NL80211_IFTYPE_STATION: break; case NL80211_IFTYPE_ADHOC: - MACvRegBitsOff(priv->PortOffset, MAC_REG_RCR, RCR_UNICAST); + MACvRegBitsOff(priv->port_offset, MAC_REG_RCR, RCR_UNICAST); - MACvRegBitsOn(priv->PortOffset, MAC_REG_HOSTCR, HOSTCR_ADHOC); + MACvRegBitsOn(priv->port_offset, MAC_REG_HOSTCR, HOSTCR_ADHOC); break; case NL80211_IFTYPE_AP: - MACvRegBitsOff(priv->PortOffset, MAC_REG_RCR, RCR_UNICAST); + MACvRegBitsOff(priv->port_offset, MAC_REG_RCR, RCR_UNICAST); - MACvRegBitsOn(priv->PortOffset, MAC_REG_HOSTCR, HOSTCR_AP); + MACvRegBitsOn(priv->port_offset, MAC_REG_HOSTCR, HOSTCR_AP); break; default: @@ -1334,16 +1334,16 @@ static void vnt_remove_interface(struct ieee80211_hw *hw, case NL80211_IFTYPE_STATION: break; case NL80211_IFTYPE_ADHOC: - MACvRegBitsOff(priv->PortOffset, MAC_REG_TCR, TCR_AUTOBCNTX); - MACvRegBitsOff(priv->PortOffset, + MACvRegBitsOff(priv->port_offset, MAC_REG_TCR, TCR_AUTOBCNTX); + MACvRegBitsOff(priv->port_offset, MAC_REG_TFTCTL, TFTCTL_TSFCNTREN); - MACvRegBitsOff(priv->PortOffset, MAC_REG_HOSTCR, HOSTCR_ADHOC); + MACvRegBitsOff(priv->port_offset, MAC_REG_HOSTCR, HOSTCR_ADHOC); break; case NL80211_IFTYPE_AP: - MACvRegBitsOff(priv->PortOffset, MAC_REG_TCR, TCR_AUTOBCNTX); - MACvRegBitsOff(priv->PortOffset, + MACvRegBitsOff(priv->port_offset, MAC_REG_TCR, TCR_AUTOBCNTX); + MACvRegBitsOff(priv->port_offset, MAC_REG_TFTCTL, TFTCTL_TSFCNTREN); - MACvRegBitsOff(priv->PortOffset, MAC_REG_HOSTCR, HOSTCR_AP); + MACvRegBitsOff(priv->port_offset, MAC_REG_HOSTCR, HOSTCR_AP); break; default: break; @@ -1407,7 +1407,7 @@ static void vnt_bss_info_changed(struct ieee80211_hw *hw, spin_lock_irqsave(&priv->lock, flags); - MACvWriteBSSIDAddress(priv->PortOffset, (u8 *)conf->bssid); + MACvWriteBSSIDAddress(priv->port_offset, (u8 *)conf->bssid); spin_unlock_irqrestore(&priv->lock, flags); } @@ -1423,19 +1423,19 @@ static void vnt_bss_info_changed(struct ieee80211_hw *hw, if (changed & BSS_CHANGED_ERP_PREAMBLE) { if (conf->use_short_preamble) { - MACvEnableBarkerPreambleMd(priv->PortOffset); priv->byPreambleType = true; + MACvEnableBarkerPreambleMd(priv->port_offset); } else { - MACvDisableBarkerPreambleMd(priv->PortOffset); priv->byPreambleType = false; + MACvDisableBarkerPreambleMd(priv->port_offset); } } if (changed & BSS_CHANGED_ERP_CTS_PROT) { if (conf->use_cts_prot) - MACvEnableProtectMD(priv->PortOffset); + MACvEnableProtectMD(priv->port_offset); else - MACvDisableProtectMD(priv->PortOffset); + MACvDisableProtectMD(priv->port_offset); } if (changed & BSS_CHANGED_ERP_SLOT) { @@ -1459,10 +1459,10 @@ static void vnt_bss_info_changed(struct ieee80211_hw *hw, if (conf->enable_beacon) { vnt_beacon_enable(priv, vif, conf); - MACvRegBitsOn(priv->PortOffset, MAC_REG_TCR, + MACvRegBitsOn(priv->port_offset, MAC_REG_TCR, TCR_AUTOBCNTX); } else { - MACvRegBitsOff(priv->PortOffset, MAC_REG_TCR, + MACvRegBitsOff(priv->port_offset, MAC_REG_TCR, TCR_AUTOBCNTX); } } @@ -1477,9 +1477,9 @@ static void vnt_bss_info_changed(struct ieee80211_hw *hw, CARDvSetFirstNextTBTT(priv, conf->beacon_int); } else { - VNSvOutPortB(priv->PortOffset + MAC_REG_TFTCTL, + VNSvOutPortB(priv->port_offset + MAC_REG_TFTCTL, TFTCTL_TSFCNTRST); - VNSvOutPortB(priv->PortOffset + MAC_REG_TFTCTL, + VNSvOutPortB(priv->port_offset + MAC_REG_TFTCTL, TFTCTL_TSFCNTREN); } } @@ -1513,7 +1513,7 @@ static void vnt_configure(struct ieee80211_hw *hw, *total_flags &= FIF_ALLMULTI | FIF_OTHER_BSS | FIF_BCN_PRBRESP_PROMISC; - VNSvInPortB(priv->PortOffset + MAC_REG_RCR, &rx_mode); + VNSvInPortB(priv->port_offset + MAC_REG_RCR, &rx_mode); dev_dbg(&priv->pcid->dev, "rx mode in = %x\n", rx_mode); @@ -1524,24 +1524,24 @@ static void vnt_configure(struct ieee80211_hw *hw, spin_lock_irqsave(&priv->lock, flags); if (priv->mc_list_count > 2) { - MACvSelectPage1(priv->PortOffset); + MACvSelectPage1(priv->port_offset); - VNSvOutPortD(priv->PortOffset + + VNSvOutPortD(priv->port_offset + MAC_REG_MAR0, 0xffffffff); - VNSvOutPortD(priv->PortOffset + + VNSvOutPortD(priv->port_offset + MAC_REG_MAR0 + 4, 0xffffffff); - MACvSelectPage0(priv->PortOffset); + MACvSelectPage0(priv->port_offset); } else { - MACvSelectPage1(priv->PortOffset); + MACvSelectPage1(priv->port_offset); - VNSvOutPortD(priv->PortOffset + + VNSvOutPortD(priv->port_offset + MAC_REG_MAR0, (u32)multicast); - VNSvOutPortD(priv->PortOffset + + VNSvOutPortD(priv->port_offset + MAC_REG_MAR0 + 4, (u32)(multicast >> 32)); - MACvSelectPage0(priv->PortOffset); + MACvSelectPage0(priv->port_offset); } spin_unlock_irqrestore(&priv->lock, flags); @@ -1561,7 +1561,7 @@ static void vnt_configure(struct ieee80211_hw *hw, rx_mode |= RCR_BSSID; } - VNSvOutPortB(priv->PortOffset + MAC_REG_RCR, rx_mode); + VNSvOutPortB(priv->port_offset + MAC_REG_RCR, rx_mode); dev_dbg(&priv->pcid->dev, "rx mode out= %x\n", rx_mode); } @@ -1621,7 +1621,7 @@ static void vnt_reset_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif) struct vnt_private *priv = hw->priv; /* reset TSF counter */ - VNSvOutPortB(priv->PortOffset + MAC_REG_TFTCTL, TFTCTL_TSFCNTRST); + VNSvOutPortB(priv->port_offset + MAC_REG_TFTCTL, TFTCTL_TSFCNTRST); } static const struct ieee80211_ops vnt_mac_ops = { @@ -1698,9 +1698,9 @@ vt6655_probe(struct pci_dev *pcid, const struct pci_device_id *ent) priv->memaddr = pci_resource_start(pcid, 0); priv->ioaddr = pci_resource_start(pcid, 1); - priv->PortOffset = ioremap(priv->memaddr & PCI_BASE_ADDRESS_MEM_MASK, + priv->port_offset = ioremap(priv->memaddr & PCI_BASE_ADDRESS_MEM_MASK, 256); - if (!priv->PortOffset) { + if (!priv->port_offset) { dev_err(&pcid->dev, ": Failed to IO remapping ..\n"); device_free_info(priv); return -ENODEV; @@ -1729,10 +1729,10 @@ vt6655_probe(struct pci_dev *pcid, const struct pci_device_id *ent) } /* initial to reload eeprom */ MACvInitialize(priv); - MACvReadEtherAddress(priv->PortOffset, priv->abyCurrentNetAddr); + MACvReadEtherAddress(priv->port_offset, priv->abyCurrentNetAddr); /* Get RFType */ - priv->byRFType = SROMbyReadEmbedded(priv->PortOffset, EEP_OFS_RFTYPE); + priv->byRFType = SROMbyReadEmbedded(priv->port_offset, EEP_OFS_RFTYPE); priv->byRFType &= RF_MASK; dev_dbg(&pcid->dev, "RF Type = %x\n", priv->byRFType); diff --git a/drivers/staging/vt6655/mac.c b/drivers/staging/vt6655/mac.c index 9721c2234bf2..1ae7148b4092 100644 --- a/drivers/staging/vt6655/mac.c +++ b/drivers/staging/vt6655/mac.c @@ -57,7 +57,7 @@ bool MACbIsRegBitsOff(struct vnt_private *priv, unsigned char byRegOfs, unsigned char byTestBits) { - void __iomem *io_base = priv->PortOffset; + void __iomem *io_base = priv->port_offset; return !(ioread8(io_base + byRegOfs) & byTestBits); } @@ -77,7 +77,7 @@ bool MACbIsRegBitsOff(struct vnt_private *priv, unsigned char byRegOfs, */ bool MACbIsIntDisable(struct vnt_private *priv) { - void __iomem *io_base = priv->PortOffset; + void __iomem *io_base = priv->port_offset; if (ioread32(io_base + MAC_REG_IMR)) return false; @@ -102,7 +102,7 @@ bool MACbIsIntDisable(struct vnt_private *priv) void MACvSetShortRetryLimit(struct vnt_private *priv, unsigned char byRetryLimit) { - void __iomem *io_base = priv->PortOffset; + void __iomem *io_base = priv->port_offset; /* set SRT */ iowrite8(byRetryLimit, io_base + MAC_REG_SRT); } @@ -124,7 +124,7 @@ void MACvSetShortRetryLimit(struct vnt_private *priv, void MACvSetLongRetryLimit(struct vnt_private *priv, unsigned char byRetryLimit) { - void __iomem *io_base = priv->PortOffset; + void __iomem *io_base = priv->port_offset; /* set LRT */ iowrite8(byRetryLimit, io_base + MAC_REG_LRT); } @@ -145,7 +145,7 @@ void MACvSetLongRetryLimit(struct vnt_private *priv, */ void MACvSetLoopbackMode(struct vnt_private *priv, unsigned char byLoopbackMode) { - void __iomem *io_base = priv->PortOffset; + void __iomem *io_base = priv->port_offset; byLoopbackMode <<= 6; /* set TCR */ @@ -168,7 +168,7 @@ void MACvSetLoopbackMode(struct vnt_private *priv, unsigned char byLoopbackMode) */ void MACvSaveContext(struct vnt_private *priv, unsigned char *cxt_buf) { - void __iomem *io_base = priv->PortOffset; + void __iomem *io_base = priv->port_offset; /* read page0 register */ memcpy_fromio(cxt_buf, io_base, MAC_MAX_CONTEXT_SIZE_PAGE0); @@ -198,7 +198,7 @@ void MACvSaveContext(struct vnt_private *priv, unsigned char *cxt_buf) */ void MACvRestoreContext(struct vnt_private *priv, unsigned char *cxt_buf) { - void __iomem *io_base = priv->PortOffset; + void __iomem *io_base = priv->port_offset; MACvSelectPage1(io_base); /* restore page1 */ @@ -249,7 +249,7 @@ void MACvRestoreContext(struct vnt_private *priv, unsigned char *cxt_buf) */ bool MACbSoftwareReset(struct vnt_private *priv) { - void __iomem *io_base = priv->PortOffset; + void __iomem *io_base = priv->port_offset; unsigned short ww; /* turn on HOSTCR_SOFTRST, just write 0x01 to reset */ @@ -312,7 +312,7 @@ bool MACbSafeSoftwareReset(struct vnt_private *priv) */ bool MACbSafeRxOff(struct vnt_private *priv) { - void __iomem *io_base = priv->PortOffset; + void __iomem *io_base = priv->port_offset; unsigned short ww; /* turn off wow temp for turn off Rx safely */ @@ -366,7 +366,7 @@ bool MACbSafeRxOff(struct vnt_private *priv) */ bool MACbSafeTxOff(struct vnt_private *priv) { - void __iomem *io_base = priv->PortOffset; + void __iomem *io_base = priv->port_offset; unsigned short ww; /* Clear TX DMA */ @@ -422,7 +422,7 @@ bool MACbSafeTxOff(struct vnt_private *priv) */ bool MACbSafeStop(struct vnt_private *priv) { - void __iomem *io_base = priv->PortOffset; + void __iomem *io_base = priv->port_offset; MACvRegBitsOff(io_base, MAC_REG_TCR, TCR_AUTOBCNTX); @@ -457,7 +457,7 @@ bool MACbSafeStop(struct vnt_private *priv) */ bool MACbShutdown(struct vnt_private *priv) { - void __iomem *io_base = priv->PortOffset; + void __iomem *io_base = priv->port_offset; /* disable MAC IMR */ MACvIntDisable(io_base); MACvSetLoopbackMode(priv, MAC_LB_INTERNAL); @@ -485,7 +485,7 @@ bool MACbShutdown(struct vnt_private *priv) */ void MACvInitialize(struct vnt_private *priv) { - void __iomem *io_base = priv->PortOffset; + void __iomem *io_base = priv->port_offset; /* clear sticky bits */ MACvClearStckDS(io_base); /* disable force PME-enable */ @@ -517,7 +517,7 @@ void MACvInitialize(struct vnt_private *priv) */ void MACvSetCurrRx0DescAddr(struct vnt_private *priv, u32 curr_desc_addr) { - void __iomem *io_base = priv->PortOffset; + void __iomem *io_base = priv->port_offset; unsigned short ww; unsigned char org_dma_ctl; @@ -551,7 +551,7 @@ void MACvSetCurrRx0DescAddr(struct vnt_private *priv, u32 curr_desc_addr) */ void MACvSetCurrRx1DescAddr(struct vnt_private *priv, u32 curr_desc_addr) { - void __iomem *io_base = priv->PortOffset; + void __iomem *io_base = priv->port_offset; unsigned short ww; unsigned char org_dma_ctl; @@ -586,7 +586,7 @@ void MACvSetCurrRx1DescAddr(struct vnt_private *priv, u32 curr_desc_addr) void MACvSetCurrTx0DescAddrEx(struct vnt_private *priv, u32 curr_desc_addr) { - void __iomem *io_base = priv->PortOffset; + void __iomem *io_base = priv->port_offset; unsigned short ww; unsigned char org_dma_ctl; @@ -622,7 +622,7 @@ void MACvSetCurrTx0DescAddrEx(struct vnt_private *priv, void MACvSetCurrAC0DescAddrEx(struct vnt_private *priv, u32 curr_desc_addr) { - void __iomem *io_base = priv->PortOffset; + void __iomem *io_base = priv->port_offset; unsigned short ww; unsigned char org_dma_ctl; @@ -666,7 +666,7 @@ void MACvSetCurrTXDescAddr(int iTxType, struct vnt_private *priv, */ void MACvTimer0MicroSDelay(struct vnt_private *priv, unsigned int uDelay) { - void __iomem *io_base = priv->PortOffset; + void __iomem *io_base = priv->port_offset; unsigned char byValue; unsigned int uu, ii; @@ -703,7 +703,7 @@ void MACvTimer0MicroSDelay(struct vnt_private *priv, unsigned int uDelay) void MACvOneShotTimer1MicroSec(struct vnt_private *priv, unsigned int uDelayTime) { - void __iomem *io_base = priv->PortOffset; + void __iomem *io_base = priv->port_offset; iowrite8(0, io_base + MAC_REG_TMCTL1); iowrite32(uDelayTime, io_base + MAC_REG_TMDATA1); @@ -713,7 +713,7 @@ void MACvOneShotTimer1MicroSec(struct vnt_private *priv, void MACvSetMISCFifo(struct vnt_private *priv, unsigned short offset, u32 data) { - void __iomem *io_base = priv->PortOffset; + void __iomem *io_base = priv->port_offset; if (offset > 273) return; @@ -724,7 +724,7 @@ void MACvSetMISCFifo(struct vnt_private *priv, unsigned short offset, bool MACbPSWakeup(struct vnt_private *priv) { - void __iomem *io_base = priv->PortOffset; + void __iomem *io_base = priv->port_offset; unsigned int ww; /* Read PSCTL */ if (MACbIsRegBitsOff(priv, MAC_REG_PSCTL, PSCTL_PS)) @@ -765,7 +765,7 @@ void MACvSetKeyEntry(struct vnt_private *priv, unsigned short wKeyCtl, unsigned char *pbyAddr, u32 *pdwKey, unsigned char byLocalID) { - void __iomem *io_base = priv->PortOffset; + void __iomem *io_base = priv->port_offset; unsigned short offset; u32 data; int ii; @@ -830,7 +830,7 @@ void MACvSetKeyEntry(struct vnt_private *priv, unsigned short wKeyCtl, */ void MACvDisableKeyEntry(struct vnt_private *priv, unsigned int uEntryIdx) { - void __iomem *io_base = priv->PortOffset; + void __iomem *io_base = priv->port_offset; unsigned short offset; offset = MISCFIFO_KEYETRY0; diff --git a/drivers/staging/vt6655/power.c b/drivers/staging/vt6655/power.c index aac021e983d1..06066fa56dd5 100644 --- a/drivers/staging/vt6655/power.c +++ b/drivers/staging/vt6655/power.c @@ -52,30 +52,30 @@ void PSvEnablePowerSaving(struct vnt_private *priv, u16 wAID = priv->current_aid | BIT(14) | BIT(15); /* set period of power up before TBTT */ - VNSvOutPortW(priv->PortOffset + MAC_REG_PWBT, C_PWBT); + VNSvOutPortW(priv->port_offset + MAC_REG_PWBT, C_PWBT); if (priv->op_mode != NL80211_IFTYPE_ADHOC) { /* set AID */ - VNSvOutPortW(priv->PortOffset + MAC_REG_AIDATIM, wAID); + VNSvOutPortW(priv->port_offset + MAC_REG_AIDATIM, wAID); } /* Set AutoSleep */ - MACvRegBitsOn(priv->PortOffset, MAC_REG_PSCFG, PSCFG_AUTOSLEEP); + MACvRegBitsOn(priv->port_offset, MAC_REG_PSCFG, PSCFG_AUTOSLEEP); /* Set HWUTSF */ - MACvRegBitsOn(priv->PortOffset, MAC_REG_TFTCTL, TFTCTL_HWUTSF); + MACvRegBitsOn(priv->port_offset, MAC_REG_TFTCTL, TFTCTL_HWUTSF); if (wListenInterval >= 2) { /* clear always listen beacon */ - MACvRegBitsOff(priv->PortOffset, MAC_REG_PSCTL, PSCTL_ALBCN); + MACvRegBitsOff(priv->port_offset, MAC_REG_PSCTL, PSCTL_ALBCN); /* first time set listen next beacon */ - MACvRegBitsOn(priv->PortOffset, MAC_REG_PSCTL, PSCTL_LNBCN); + MACvRegBitsOn(priv->port_offset, MAC_REG_PSCTL, PSCTL_LNBCN); } else { /* always listen beacon */ - MACvRegBitsOn(priv->PortOffset, MAC_REG_PSCTL, PSCTL_ALBCN); + MACvRegBitsOn(priv->port_offset, MAC_REG_PSCTL, PSCTL_ALBCN); } /* enable power saving hw function */ - MACvRegBitsOn(priv->PortOffset, MAC_REG_PSCTL, PSCTL_PSEN); + MACvRegBitsOn(priv->port_offset, MAC_REG_PSCTL, PSCTL_PSEN); priv->bEnablePSMode = true; priv->bPWBitOn = true; @@ -98,13 +98,13 @@ void PSvDisablePowerSaving(struct vnt_private *priv) MACbPSWakeup(priv); /* clear AutoSleep */ - MACvRegBitsOff(priv->PortOffset, MAC_REG_PSCFG, PSCFG_AUTOSLEEP); + MACvRegBitsOff(priv->port_offset, MAC_REG_PSCFG, PSCFG_AUTOSLEEP); /* clear HWUTSF */ - MACvRegBitsOff(priv->PortOffset, MAC_REG_TFTCTL, TFTCTL_HWUTSF); + MACvRegBitsOff(priv->port_offset, MAC_REG_TFTCTL, TFTCTL_HWUTSF); /* set always listen beacon */ - MACvRegBitsOn(priv->PortOffset, MAC_REG_PSCTL, PSCTL_ALBCN); + MACvRegBitsOn(priv->port_offset, MAC_REG_PSCTL, PSCTL_ALBCN); priv->bEnablePSMode = false; @@ -135,7 +135,7 @@ bool PSbIsNextTBTTWakeUp(struct vnt_private *priv) if (priv->wake_up_count == 1) { /* Turn on wake up to listen next beacon */ - MACvRegBitsOn(priv->PortOffset, + MACvRegBitsOn(priv->port_offset, MAC_REG_PSCTL, PSCTL_LNBCN); wake_up = true; } diff --git a/drivers/staging/vt6655/rf.c b/drivers/staging/vt6655/rf.c index 0dae593c6944..a6f17162d017 100644 --- a/drivers/staging/vt6655/rf.c +++ b/drivers/staging/vt6655/rf.c @@ -406,7 +406,7 @@ static const unsigned long dwAL7230ChannelTable2[CB_MAX_CHANNEL] = { */ static bool s_bAL7230Init(struct vnt_private *priv) { - void __iomem *iobase = priv->PortOffset; + void __iomem *iobase = priv->port_offset; int ii; bool ret; @@ -455,7 +455,7 @@ static bool s_bAL7230Init(struct vnt_private *priv) */ static bool s_bAL7230SelectChannel(struct vnt_private *priv, unsigned char byChannel) { - void __iomem *iobase = priv->PortOffset; + void __iomem *iobase = priv->port_offset; bool ret; ret = true; @@ -494,7 +494,7 @@ static bool s_bAL7230SelectChannel(struct vnt_private *priv, unsigned char byCha */ bool IFRFbWriteEmbedded(struct vnt_private *priv, unsigned long dwData) { - void __iomem *iobase = priv->PortOffset; + void __iomem *iobase = priv->port_offset; unsigned short ww; unsigned long dwValue; @@ -527,7 +527,7 @@ bool IFRFbWriteEmbedded(struct vnt_private *priv, unsigned long dwData) */ static bool RFbAL2230Init(struct vnt_private *priv) { - void __iomem *iobase = priv->PortOffset; + void __iomem *iobase = priv->port_offset; int ii; bool ret; @@ -572,7 +572,7 @@ static bool RFbAL2230Init(struct vnt_private *priv) static bool RFbAL2230SelectChannel(struct vnt_private *priv, unsigned char byChannel) { - void __iomem *iobase = priv->PortOffset; + void __iomem *iobase = priv->port_offset; bool ret; ret = true; @@ -679,7 +679,7 @@ bool RFbSelectChannel(struct vnt_private *priv, unsigned char byRFType, bool RFvWriteWakeProgSyn(struct vnt_private *priv, unsigned char byRFType, u16 uChannel) { - void __iomem *iobase = priv->PortOffset; + void __iomem *iobase = priv->port_offset; int ii; unsigned char byInitCount = 0; unsigned char bySleepCount = 0; diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c index 5395c3a3e35a..7ec7fd309329 100644 --- a/drivers/staging/vt6655/rxtx.c +++ b/drivers/staging/vt6655/rxtx.c @@ -1422,13 +1422,13 @@ static int vnt_beacon_xmit(struct vnt_private *priv, priv->wBCNBufLen = sizeof(*short_head) + skb->len; - MACvSetCurrBCNTxDescAddr(priv->PortOffset, priv->tx_beacon_dma); + MACvSetCurrBCNTxDescAddr(priv->port_offset, priv->tx_beacon_dma); - MACvSetCurrBCNLength(priv->PortOffset, priv->wBCNBufLen); + MACvSetCurrBCNLength(priv->port_offset, priv->wBCNBufLen); /* Set auto Transmit on */ - MACvRegBitsOn(priv->PortOffset, MAC_REG_TCR, TCR_AUTOBCNTX); + MACvRegBitsOn(priv->port_offset, MAC_REG_TCR, TCR_AUTOBCNTX); /* Poll Transmit the adapter */ - MACvTransmitBCN(priv->PortOffset); + MACvTransmitBCN(priv->port_offset); return 0; } @@ -1452,9 +1452,9 @@ int vnt_beacon_make(struct vnt_private *priv, struct ieee80211_vif *vif) int vnt_beacon_enable(struct vnt_private *priv, struct ieee80211_vif *vif, struct ieee80211_bss_conf *conf) { - VNSvOutPortB(priv->PortOffset + MAC_REG_TFTCTL, TFTCTL_TSFCNTRST); + VNSvOutPortB(priv->port_offset + MAC_REG_TFTCTL, TFTCTL_TSFCNTRST); - VNSvOutPortB(priv->PortOffset + MAC_REG_TFTCTL, TFTCTL_TSFCNTREN); + VNSvOutPortB(priv->port_offset + MAC_REG_TFTCTL, TFTCTL_TSFCNTREN); CARDvSetFirstNextTBTT(priv, conf->beacon_int); -- 2.25.1 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH v2 3/3] staging: vt6655: replace camel case port_offset instead of PortOffset. @ 2021-09-24 21:00 ` Tommaso Merciai 0 siblings, 0 replies; 13+ messages in thread From: Tommaso Merciai @ 2021-09-24 21:00 UTC (permalink / raw) Cc: tomm.merciai, Forest Bond, Greg Kroah-Hartman, Madhumitha Prabakaran, Yujia Qiao, Lucas Henneman, Marcos Antonio de Jesus Filho, Edmundo Carmona Antoranz, Aldas Taraškevičius, Gustavo A. R. Silva, Deepak R Varma, linux-staging, linux-kernel Signed-off-by: Tommaso Merciai <tomm.merciai@gmail.com> --- drivers/staging/vt6655/baseband.c | 6 +- drivers/staging/vt6655/card.c | 88 ++++++++-------- drivers/staging/vt6655/channel.c | 10 +- drivers/staging/vt6655/device.h | 2 +- drivers/staging/vt6655/device_main.c | 144 +++++++++++++-------------- drivers/staging/vt6655/mac.c | 46 ++++----- drivers/staging/vt6655/power.c | 24 ++--- drivers/staging/vt6655/rf.c | 12 +-- drivers/staging/vt6655/rxtx.c | 12 +-- 9 files changed, 172 insertions(+), 172 deletions(-) diff --git a/drivers/staging/vt6655/baseband.c b/drivers/staging/vt6655/baseband.c index 55bddbda50cd..c51c3ef8546a 100644 --- a/drivers/staging/vt6655/baseband.c +++ b/drivers/staging/vt6655/baseband.c @@ -1905,7 +1905,7 @@ void vnt_get_phy_field(struct vnt_private *priv, u32 frame_length, bool bb_read_embedded(struct vnt_private *priv, unsigned char by_bb_addr, unsigned char *pby_data) { - void __iomem *iobase = priv->PortOffset; + void __iomem *iobase = priv->port_offset; unsigned short ww; unsigned char by_value; @@ -1948,7 +1948,7 @@ bool bb_read_embedded(struct vnt_private *priv, unsigned char by_bb_addr, bool bb_write_embedded(struct vnt_private *priv, unsigned char by_bb_addr, unsigned char by_data) { - void __iomem *iobase = priv->PortOffset; + void __iomem *iobase = priv->port_offset; unsigned short ww; unsigned char by_value; @@ -1992,7 +1992,7 @@ bool bb_vt3253_init(struct vnt_private *priv) { bool result = true; int ii; - void __iomem *iobase = priv->PortOffset; + void __iomem *iobase = priv->port_offset; unsigned char by_rf_type = priv->byRFType; unsigned char by_local_id = priv->byLocalID; diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c index 7a08ea0c7692..4764dfaf243a 100644 --- a/drivers/staging/vt6655/card.c +++ b/drivers/staging/vt6655/card.c @@ -190,7 +190,7 @@ bool CARDbSetPhyParameter(struct vnt_private *priv, u8 bb_type) if (bb_type == BB_TYPE_11A) { if (priv->byRFType == RF_AIROHA7230) { /* AL7230 use single PAPE and connect to PAPE_2.4G */ - MACvSetBBType(priv->PortOffset, BB_TYPE_11G); + MACvSetBBType(priv->port_offset, BB_TYPE_11G); priv->abyBBVGA[0] = 0x20; priv->abyBBVGA[2] = 0x10; priv->abyBBVGA[3] = 0x10; @@ -199,7 +199,7 @@ bool CARDbSetPhyParameter(struct vnt_private *priv, u8 bb_type) bb_write_embedded(priv, 0xE7, priv->abyBBVGA[0]); } else if (priv->byRFType == RF_UW2452) { - MACvSetBBType(priv->PortOffset, BB_TYPE_11A); + MACvSetBBType(priv->port_offset, BB_TYPE_11A); priv->abyBBVGA[0] = 0x18; bb_read_embedded(priv, 0xE7, &byData); if (byData == 0x14) { @@ -207,7 +207,7 @@ bool CARDbSetPhyParameter(struct vnt_private *priv, u8 bb_type) bb_write_embedded(priv, 0xE1, 0x57); } } else { - MACvSetBBType(priv->PortOffset, BB_TYPE_11A); + MACvSetBBType(priv->port_offset, BB_TYPE_11A); } bb_write_embedded(priv, 0x88, 0x03); bySlot = C_SLOT_SHORT; @@ -215,7 +215,7 @@ bool CARDbSetPhyParameter(struct vnt_private *priv, u8 bb_type) byDIFS = C_SIFS_A + 2 * C_SLOT_SHORT; byCWMaxMin = 0xA4; } else if (bb_type == BB_TYPE_11B) { - MACvSetBBType(priv->PortOffset, BB_TYPE_11B); + MACvSetBBType(priv->port_offset, BB_TYPE_11B); if (priv->byRFType == RF_AIROHA7230) { priv->abyBBVGA[0] = 0x1C; priv->abyBBVGA[2] = 0x00; @@ -238,7 +238,7 @@ bool CARDbSetPhyParameter(struct vnt_private *priv, u8 bb_type) byDIFS = C_SIFS_BG + 2 * C_SLOT_LONG; byCWMaxMin = 0xA5; } else { /* PK_TYPE_11GA & PK_TYPE_11GB */ - MACvSetBBType(priv->PortOffset, BB_TYPE_11G); + MACvSetBBType(priv->port_offset, BB_TYPE_11G); if (priv->byRFType == RF_AIROHA7230) { priv->abyBBVGA[0] = 0x1C; priv->abyBBVGA[2] = 0x00; @@ -292,25 +292,25 @@ bool CARDbSetPhyParameter(struct vnt_private *priv, u8 bb_type) if (priv->bySIFS != bySIFS) { priv->bySIFS = bySIFS; - VNSvOutPortB(priv->PortOffset + MAC_REG_SIFS, priv->bySIFS); + VNSvOutPortB(priv->port_offset + MAC_REG_SIFS, priv->bySIFS); } if (priv->byDIFS != byDIFS) { priv->byDIFS = byDIFS; - VNSvOutPortB(priv->PortOffset + MAC_REG_DIFS, priv->byDIFS); + VNSvOutPortB(priv->port_offset + MAC_REG_DIFS, priv->byDIFS); } if (priv->byEIFS != C_EIFS) { priv->byEIFS = C_EIFS; - VNSvOutPortB(priv->PortOffset + MAC_REG_EIFS, priv->byEIFS); + VNSvOutPortB(priv->port_offset + MAC_REG_EIFS, priv->byEIFS); } if (priv->bySlot != bySlot) { priv->bySlot = bySlot; - VNSvOutPortB(priv->PortOffset + MAC_REG_SLOT, priv->bySlot); + VNSvOutPortB(priv->port_offset + MAC_REG_SLOT, priv->bySlot); bb_set_short_slot_time(priv); } if (priv->byCWMaxMin != byCWMaxMin) { priv->byCWMaxMin = byCWMaxMin; - VNSvOutPortB(priv->PortOffset + MAC_REG_CWMAXMIN0, + VNSvOutPortB(priv->port_offset + MAC_REG_CWMAXMIN0, priv->byCWMaxMin); } @@ -348,11 +348,11 @@ bool CARDbUpdateTSF(struct vnt_private *priv, unsigned char byRxRate, qwTSFOffset = CARDqGetTSFOffset(byRxRate, qwBSSTimestamp, local_tsf); /* adjust TSF, HW's TSF add TSF Offset reg */ - VNSvOutPortD(priv->PortOffset + MAC_REG_TSFOFST, + VNSvOutPortD(priv->port_offset + MAC_REG_TSFOFST, (u32)qwTSFOffset); - VNSvOutPortD(priv->PortOffset + MAC_REG_TSFOFST + 4, + VNSvOutPortD(priv->port_offset + MAC_REG_TSFOFST + 4, (u32)(qwTSFOffset >> 32)); - MACvRegBitsOn(priv->PortOffset, MAC_REG_TFTCTL, + MACvRegBitsOn(priv->port_offset, MAC_REG_TFTCTL, TFTCTL_TSFSYNCEN); } return true; @@ -381,13 +381,13 @@ bool CARDbSetBeaconPeriod(struct vnt_private *priv, qwNextTBTT = CARDqGetNextTBTT(qwNextTBTT, wBeaconInterval); /* set HW beacon interval */ - VNSvOutPortW(priv->PortOffset + MAC_REG_BI, wBeaconInterval); + VNSvOutPortW(priv->port_offset + MAC_REG_BI, wBeaconInterval); priv->wBeaconInterval = wBeaconInterval; /* Set NextTBTT */ - VNSvOutPortD(priv->PortOffset + MAC_REG_NEXTTBTT, (u32)qwNextTBTT); - VNSvOutPortD(priv->PortOffset + MAC_REG_NEXTTBTT + 4, + VNSvOutPortD(priv->port_offset + MAC_REG_NEXTTBTT, (u32)qwNextTBTT); + VNSvOutPortD(priv->port_offset + MAC_REG_NEXTTBTT + 4, (u32)(qwNextTBTT >> 32)); - MACvRegBitsOn(priv->PortOffset, MAC_REG_TFTCTL, TFTCTL_TBTTSYNCEN); + MACvRegBitsOn(priv->port_offset, MAC_REG_TFTCTL, TFTCTL_TBTTSYNCEN); return true; } @@ -409,29 +409,29 @@ void CARDbRadioPowerOff(struct vnt_private *priv) switch (priv->byRFType) { case RF_RFMD2959: - MACvWordRegBitsOff(priv->PortOffset, MAC_REG_SOFTPWRCTL, + MACvWordRegBitsOff(priv->port_offset, MAC_REG_SOFTPWRCTL, SOFTPWRCTL_TXPEINV); - MACvWordRegBitsOn(priv->PortOffset, MAC_REG_SOFTPWRCTL, + MACvWordRegBitsOn(priv->port_offset, MAC_REG_SOFTPWRCTL, SOFTPWRCTL_SWPE1); break; case RF_AIROHA: case RF_AL2230S: case RF_AIROHA7230: - MACvWordRegBitsOff(priv->PortOffset, MAC_REG_SOFTPWRCTL, + MACvWordRegBitsOff(priv->port_offset, MAC_REG_SOFTPWRCTL, SOFTPWRCTL_SWPE2); - MACvWordRegBitsOff(priv->PortOffset, MAC_REG_SOFTPWRCTL, + MACvWordRegBitsOff(priv->port_offset, MAC_REG_SOFTPWRCTL, SOFTPWRCTL_SWPE3); break; } - MACvRegBitsOff(priv->PortOffset, MAC_REG_HOSTCR, HOSTCR_RXON); + MACvRegBitsOff(priv->port_offset, MAC_REG_HOSTCR, HOSTCR_RXON); bb_set_deep_sleep(priv, priv->byLocalID); priv->bRadioOff = true; pr_debug("chester power off\n"); - MACvRegBitsOn(priv->PortOffset, MAC_REG_GPIOCTL0, + MACvRegBitsOn(priv->port_offset, MAC_REG_GPIOCTL0, LED_ACTSET); /* LED issue */ } @@ -467,7 +467,7 @@ void CARDvSafeResetTx(struct vnt_private *priv) MACvSetCurrTXDescAddr(TYPE_AC0DMA, priv, priv->td1_pool_dma); /* set MAC Beacon TX pointer */ - MACvSetCurrBCNTxDescAddr(priv->PortOffset, + MACvSetCurrBCNTxDescAddr(priv->port_offset, (priv->tx_beacon_dma)); } @@ -509,8 +509,8 @@ void CARDvSafeResetRx(struct vnt_private *priv) } /* set perPkt mode */ - MACvRx0PerPktMode(priv->PortOffset); - MACvRx1PerPktMode(priv->PortOffset); + MACvRx0PerPktMode(priv->port_offset); + MACvRx1PerPktMode(priv->port_offset); /* set MAC RD pointer */ MACvSetCurrRx0DescAddr(priv, priv->rd0_pool_dma); @@ -599,7 +599,7 @@ void CARDvSetRSPINF(struct vnt_private *priv, u8 bb_type) spin_lock_irqsave(&priv->lock, flags); /* Set to Page1 */ - MACvSelectPage1(priv->PortOffset); + MACvSelectPage1(priv->port_offset); /* RSPINF_b_1 */ vnt_get_phy_field(priv, 14, @@ -609,7 +609,7 @@ void CARDvSetRSPINF(struct vnt_private *priv, u8 bb_type) /* swap over to get correct write order */ swap(phy.swap[0], phy.swap[1]); - VNSvOutPortD(priv->PortOffset + MAC_REG_RSPINF_B_1, phy.field_write); + VNSvOutPortD(priv->port_offset + MAC_REG_RSPINF_B_1, phy.field_write); /* RSPINF_b_2 */ vnt_get_phy_field(priv, 14, @@ -618,7 +618,7 @@ void CARDvSetRSPINF(struct vnt_private *priv, u8 bb_type) swap(phy.swap[0], phy.swap[1]); - VNSvOutPortD(priv->PortOffset + MAC_REG_RSPINF_B_2, phy.field_write); + VNSvOutPortD(priv->port_offset + MAC_REG_RSPINF_B_2, phy.field_write); /* RSPINF_b_5 */ vnt_get_phy_field(priv, 14, @@ -627,7 +627,7 @@ void CARDvSetRSPINF(struct vnt_private *priv, u8 bb_type) swap(phy.swap[0], phy.swap[1]); - VNSvOutPortD(priv->PortOffset + MAC_REG_RSPINF_B_5, phy.field_write); + VNSvOutPortD(priv->port_offset + MAC_REG_RSPINF_B_5, phy.field_write); /* RSPINF_b_11 */ vnt_get_phy_field(priv, 14, @@ -636,42 +636,42 @@ void CARDvSetRSPINF(struct vnt_private *priv, u8 bb_type) swap(phy.swap[0], phy.swap[1]); - VNSvOutPortD(priv->PortOffset + MAC_REG_RSPINF_B_11, phy.field_write); + VNSvOutPortD(priv->port_offset + MAC_REG_RSPINF_B_11, phy.field_write); /* RSPINF_a_6 */ s_vCalculateOFDMRParameter(RATE_6M, bb_type, &byTxRate, &byRsvTime); - VNSvOutPortW(priv->PortOffset + MAC_REG_RSPINF_A_6, + VNSvOutPortW(priv->port_offset + MAC_REG_RSPINF_A_6, MAKEWORD(byTxRate, byRsvTime)); /* RSPINF_a_9 */ s_vCalculateOFDMRParameter(RATE_9M, bb_type, &byTxRate, &byRsvTime); - VNSvOutPortW(priv->PortOffset + MAC_REG_RSPINF_A_9, + VNSvOutPortW(priv->port_offset + MAC_REG_RSPINF_A_9, MAKEWORD(byTxRate, byRsvTime)); /* RSPINF_a_12 */ s_vCalculateOFDMRParameter(RATE_12M, bb_type, &byTxRate, &byRsvTime); - VNSvOutPortW(priv->PortOffset + MAC_REG_RSPINF_A_12, + VNSvOutPortW(priv->port_offset + MAC_REG_RSPINF_A_12, MAKEWORD(byTxRate, byRsvTime)); /* RSPINF_a_18 */ s_vCalculateOFDMRParameter(RATE_18M, bb_type, &byTxRate, &byRsvTime); - VNSvOutPortW(priv->PortOffset + MAC_REG_RSPINF_A_18, + VNSvOutPortW(priv->port_offset + MAC_REG_RSPINF_A_18, MAKEWORD(byTxRate, byRsvTime)); /* RSPINF_a_24 */ s_vCalculateOFDMRParameter(RATE_24M, bb_type, &byTxRate, &byRsvTime); - VNSvOutPortW(priv->PortOffset + MAC_REG_RSPINF_A_24, + VNSvOutPortW(priv->port_offset + MAC_REG_RSPINF_A_24, MAKEWORD(byTxRate, byRsvTime)); /* RSPINF_a_36 */ s_vCalculateOFDMRParameter(CARDwGetOFDMControlRate((void *)priv, @@ -679,7 +679,7 @@ void CARDvSetRSPINF(struct vnt_private *priv, u8 bb_type) bb_type, &byTxRate, &byRsvTime); - VNSvOutPortW(priv->PortOffset + MAC_REG_RSPINF_A_36, + VNSvOutPortW(priv->port_offset + MAC_REG_RSPINF_A_36, MAKEWORD(byTxRate, byRsvTime)); /* RSPINF_a_48 */ s_vCalculateOFDMRParameter(CARDwGetOFDMControlRate((void *)priv, @@ -687,7 +687,7 @@ void CARDvSetRSPINF(struct vnt_private *priv, u8 bb_type) bb_type, &byTxRate, &byRsvTime); - VNSvOutPortW(priv->PortOffset + MAC_REG_RSPINF_A_48, + VNSvOutPortW(priv->port_offset + MAC_REG_RSPINF_A_48, MAKEWORD(byTxRate, byRsvTime)); /* RSPINF_a_54 */ s_vCalculateOFDMRParameter(CARDwGetOFDMControlRate((void *)priv, @@ -695,7 +695,7 @@ void CARDvSetRSPINF(struct vnt_private *priv, u8 bb_type) bb_type, &byTxRate, &byRsvTime); - VNSvOutPortW(priv->PortOffset + MAC_REG_RSPINF_A_54, + VNSvOutPortW(priv->port_offset + MAC_REG_RSPINF_A_54, MAKEWORD(byTxRate, byRsvTime)); /* RSPINF_a_72 */ s_vCalculateOFDMRParameter(CARDwGetOFDMControlRate((void *)priv, @@ -703,10 +703,10 @@ void CARDvSetRSPINF(struct vnt_private *priv, u8 bb_type) bb_type, &byTxRate, &byRsvTime); - VNSvOutPortW(priv->PortOffset + MAC_REG_RSPINF_A_72, + VNSvOutPortW(priv->port_offset + MAC_REG_RSPINF_A_72, MAKEWORD(byTxRate, byRsvTime)); /* Set to Page0 */ - MACvSelectPage0(priv->PortOffset); + MACvSelectPage0(priv->port_offset); spin_unlock_irqrestore(&priv->lock, flags); } @@ -796,7 +796,7 @@ u64 CARDqGetTSFOffset(unsigned char byRxRate, u64 qwTSF1, u64 qwTSF2) */ bool CARDbGetCurrentTSF(struct vnt_private *priv, u64 *pqwCurrTSF) { - void __iomem *iobase = priv->PortOffset; + void __iomem *iobase = priv->port_offset; unsigned short ww; unsigned char byData; @@ -857,7 +857,7 @@ u64 CARDqGetNextTBTT(u64 qwTSF, unsigned short wBeaconInterval) void CARDvSetFirstNextTBTT(struct vnt_private *priv, unsigned short wBeaconInterval) { - void __iomem *iobase = priv->PortOffset; + void __iomem *iobase = priv->port_offset; u64 qwNextTBTT = 0; CARDbGetCurrentTSF(priv, &qwNextTBTT); /* Get Local TSF counter */ @@ -886,7 +886,7 @@ void CARDvSetFirstNextTBTT(struct vnt_private *priv, void CARDvUpdateNextTBTT(struct vnt_private *priv, u64 qwTSF, unsigned short wBeaconInterval) { - void __iomem *iobase = priv->PortOffset; + void __iomem *iobase = priv->port_offset; qwTSF = CARDqGetNextTBTT(qwTSF, wBeaconInterval); /* Set NextTBTT */ diff --git a/drivers/staging/vt6655/channel.c b/drivers/staging/vt6655/channel.c index 52b6538a201a..76ee3146b865 100644 --- a/drivers/staging/vt6655/channel.c +++ b/drivers/staging/vt6655/channel.c @@ -173,7 +173,7 @@ bool set_channel(struct vnt_private *priv, struct ieee80211_channel *ch) } /* clear NAV */ - MACvRegBitsOn(priv->PortOffset, MAC_REG_MACCR, MACCR_CLRNAV); + MACvRegBitsOn(priv->port_offset, MAC_REG_MACCR, MACCR_CLRNAV); /* TX_PE will reserve 3 us for MAX2829 A mode only, * it is for better TX throughput @@ -199,14 +199,14 @@ bool set_channel(struct vnt_private *priv, struct ieee80211_channel *ch) spin_lock_irqsave(&priv->lock, flags); /* set HW default power register */ - MACvSelectPage1(priv->PortOffset); + MACvSelectPage1(priv->port_offset); RFbSetPower(priv, RATE_1M, priv->byCurrentCh); - VNSvOutPortB(priv->PortOffset + MAC_REG_PWRCCK, + VNSvOutPortB(priv->port_offset + MAC_REG_PWRCCK, priv->byCurPwr); RFbSetPower(priv, RATE_6M, priv->byCurrentCh); - VNSvOutPortB(priv->PortOffset + MAC_REG_PWROFDM, + VNSvOutPortB(priv->port_offset + MAC_REG_PWROFDM, priv->byCurPwr); - MACvSelectPage0(priv->PortOffset); + MACvSelectPage0(priv->port_offset); spin_unlock_irqrestore(&priv->lock, flags); } diff --git a/drivers/staging/vt6655/device.h b/drivers/staging/vt6655/device.h index 876472862520..5610a969dd13 100644 --- a/drivers/staging/vt6655/device.h +++ b/drivers/staging/vt6655/device.h @@ -124,7 +124,7 @@ struct vnt_private { unsigned char *tx1_bufs; unsigned char *tx_beacon_bufs; - void __iomem *PortOffset; + void __iomem *port_offset; u32 memaddr; u32 ioaddr; diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index c4384b232c33..ab7aa9a96ff3 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -219,11 +219,11 @@ static void device_init_registers(struct vnt_private *priv) MACvInitialize(priv); /* Get Local ID */ - VNSvInPortB(priv->PortOffset + MAC_REG_LOCALID, &priv->byLocalID); + VNSvInPortB(priv->port_offset + MAC_REG_LOCALID, &priv->byLocalID); spin_lock_irqsave(&priv->lock, flags); - SROMvReadAllContents(priv->PortOffset, priv->abyEEPROM); + SROMvReadAllContents(priv->port_offset, priv->abyEEPROM); spin_unlock_irqrestore(&priv->lock, flags); @@ -232,7 +232,7 @@ static void device_init_registers(struct vnt_private *priv) priv->byMaxChannel = CB_MAX_CHANNEL; /* Get Antena */ - byValue = SROMbyReadEmbedded(priv->PortOffset, EEP_OFS_ANTENNA); + byValue = SROMbyReadEmbedded(priv->port_offset, EEP_OFS_ANTENNA); if (byValue & EEP_ANTINV) priv->bTxRxAntInv = true; else @@ -292,20 +292,20 @@ static void device_init_registers(struct vnt_private *priv) /* Get Desire Power Value */ priv->byCurPwr = 0xFF; - priv->byCCKPwr = SROMbyReadEmbedded(priv->PortOffset, EEP_OFS_PWR_CCK); - priv->byOFDMPwrG = SROMbyReadEmbedded(priv->PortOffset, + priv->byCCKPwr = SROMbyReadEmbedded(priv->port_offset, EEP_OFS_PWR_CCK); + priv->byOFDMPwrG = SROMbyReadEmbedded(priv->port_offset, EEP_OFS_PWR_OFDMG); /* Load power Table */ for (ii = 0; ii < CB_MAX_CHANNEL_24G; ii++) { priv->abyCCKPwrTbl[ii + 1] = - SROMbyReadEmbedded(priv->PortOffset, + SROMbyReadEmbedded(priv->port_offset, (unsigned char)(ii + EEP_OFS_CCK_PWR_TBL)); if (priv->abyCCKPwrTbl[ii + 1] == 0) priv->abyCCKPwrTbl[ii + 1] = priv->byCCKPwr; priv->abyOFDMPwrTbl[ii + 1] = - SROMbyReadEmbedded(priv->PortOffset, + SROMbyReadEmbedded(priv->port_offset, (unsigned char)(ii + EEP_OFS_OFDM_PWR_TBL)); if (priv->abyOFDMPwrTbl[ii + 1] == 0) priv->abyOFDMPwrTbl[ii + 1] = priv->byOFDMPwrG; @@ -323,25 +323,25 @@ static void device_init_registers(struct vnt_private *priv) /* Load OFDM A Power Table */ for (ii = 0; ii < CB_MAX_CHANNEL_5G; ii++) { priv->abyOFDMPwrTbl[ii + CB_MAX_CHANNEL_24G + 1] = - SROMbyReadEmbedded(priv->PortOffset, + SROMbyReadEmbedded(priv->port_offset, (unsigned char)(ii + EEP_OFS_OFDMA_PWR_TBL)); priv->abyOFDMDefaultPwr[ii + CB_MAX_CHANNEL_24G + 1] = - SROMbyReadEmbedded(priv->PortOffset, + SROMbyReadEmbedded(priv->port_offset, (unsigned char)(ii + EEP_OFS_OFDMA_PWR_dBm)); } if (priv->byLocalID > REV_ID_VT3253_B1) { - MACvSelectPage1(priv->PortOffset); + MACvSelectPage1(priv->port_offset); - VNSvOutPortB(priv->PortOffset + MAC_REG_MSRCTL + 1, + VNSvOutPortB(priv->port_offset + MAC_REG_MSRCTL + 1, (MSRCTL1_TXPWR | MSRCTL1_CSAPAREN)); - MACvSelectPage0(priv->PortOffset); + MACvSelectPage0(priv->port_offset); } /* use relative tx timeout and 802.11i D4 */ - MACvWordRegBitsOn(priv->PortOffset, + MACvWordRegBitsOn(priv->port_offset, MAC_REG_CFG, (CFG_TKIPOPT | CFG_NOTXTIMEOUT)); /* set performance parameter by registry */ @@ -349,9 +349,9 @@ static void device_init_registers(struct vnt_private *priv) MACvSetLongRetryLimit(priv, priv->byLongRetryLimit); /* reset TSF counter */ - VNSvOutPortB(priv->PortOffset + MAC_REG_TFTCTL, TFTCTL_TSFCNTRST); + VNSvOutPortB(priv->port_offset + MAC_REG_TFTCTL, TFTCTL_TSFCNTRST); /* enable TSF counter */ - VNSvOutPortB(priv->PortOffset + MAC_REG_TFTCTL, TFTCTL_TSFCNTREN); + VNSvOutPortB(priv->port_offset + MAC_REG_TFTCTL, TFTCTL_TSFCNTREN); /* initialize BBP registers */ bb_vt3253_init(priv); @@ -371,13 +371,13 @@ static void device_init_registers(struct vnt_private *priv) priv->bRadioOff = false; - priv->byRadioCtl = SROMbyReadEmbedded(priv->PortOffset, + priv->byRadioCtl = SROMbyReadEmbedded(priv->port_offset, EEP_OFS_RADIOCTL); priv->bHWRadioOff = false; if (priv->byRadioCtl & EEP_RADIOCTL_ENABLE) { /* Get GPIO */ - MACvGPIOIn(priv->PortOffset, &priv->byGPIO); + MACvGPIOIn(priv->port_offset, &priv->byGPIO); if (((priv->byGPIO & GPIO0_DATA) && !(priv->byRadioCtl & EEP_RADIOCTL_INV)) || @@ -390,7 +390,7 @@ static void device_init_registers(struct vnt_private *priv) CARDbRadioPowerOff(priv); /* get Permanent network address */ - SROMvReadEtherAddress(priv->PortOffset, priv->abyCurrentNetAddr); + SROMvReadEtherAddress(priv->port_offset, priv->abyCurrentNetAddr); pr_debug("Network address = %pM\n", priv->abyCurrentNetAddr); /* reset Tx pointer */ @@ -399,21 +399,21 @@ static void device_init_registers(struct vnt_private *priv) CARDvSafeResetTx(priv); if (priv->byLocalID <= REV_ID_VT3253_A1) - MACvRegBitsOn(priv->PortOffset, MAC_REG_RCR, RCR_WPAERR); + MACvRegBitsOn(priv->port_offset, MAC_REG_RCR, RCR_WPAERR); /* Turn On Rx DMA */ - MACvReceive0(priv->PortOffset); - MACvReceive1(priv->PortOffset); + MACvReceive0(priv->port_offset); + MACvReceive1(priv->port_offset); /* start the adapter */ - MACvStart(priv->PortOffset); + MACvStart(priv->port_offset); } static void device_print_info(struct vnt_private *priv) { dev_info(&priv->pcid->dev, "MAC=%pM IO=0x%lx Mem=0x%lx IRQ=%d\n", priv->abyCurrentNetAddr, (unsigned long)priv->ioaddr, - (unsigned long)priv->PortOffset, priv->pcid->irq); + (unsigned long)priv->port_offset, priv->pcid->irq); } static void device_free_info(struct vnt_private *priv) @@ -424,8 +424,8 @@ static void device_free_info(struct vnt_private *priv) if (priv->mac_hw) ieee80211_unregister_hw(priv->hw); - if (priv->PortOffset) - iounmap(priv->PortOffset); + if (priv->port_offset) + iounmap(priv->port_offset); if (priv->pcid) pci_release_regions(priv->pcid); @@ -1029,7 +1029,7 @@ static void vnt_interrupt_process(struct vnt_private *priv) u32 isr; unsigned long flags; - MACvReadISR(priv->PortOffset, &isr); + MACvReadISR(priv->port_offset, &isr); if (isr == 0) return; @@ -1042,7 +1042,7 @@ static void vnt_interrupt_process(struct vnt_private *priv) spin_lock_irqsave(&priv->lock, flags); /* Read low level stats */ - MACvReadMIBCounter(priv->PortOffset, &mib_counter); + MACvReadMIBCounter(priv->port_offset, &mib_counter); low_stats->dot11RTSSuccessCount += mib_counter & 0xff; low_stats->dot11RTSFailureCount += (mib_counter >> 8) & 0xff; @@ -1056,12 +1056,12 @@ static void vnt_interrupt_process(struct vnt_private *priv) * update ISR counter */ while (isr && priv->vif) { - MACvWriteISR(priv->PortOffset, isr); + MACvWriteISR(priv->port_offset, isr); if (isr & ISR_FETALERR) { pr_debug(" ISR_FETALERR\n"); - VNSvOutPortB(priv->PortOffset + MAC_REG_SOFTPWRCTL, 0); - VNSvOutPortW(priv->PortOffset + + VNSvOutPortB(priv->port_offset + MAC_REG_SOFTPWRCTL, 0); + VNSvOutPortW(priv->port_offset + MAC_REG_SOFTPWRCTL, SOFTPWRCTL_SWPECTI); device_error(priv, isr); } @@ -1116,10 +1116,10 @@ static void vnt_interrupt_process(struct vnt_private *priv) ieee80211_queue_stopped(priv->hw, 0)) ieee80211_wake_queues(priv->hw); - MACvReadISR(priv->PortOffset, &isr); + MACvReadISR(priv->port_offset, &isr); - MACvReceive0(priv->PortOffset); - MACvReceive1(priv->PortOffset); + MACvReceive0(priv->port_offset); + MACvReceive1(priv->port_offset); if (max_count > priv->opts.int_works) break; @@ -1136,7 +1136,7 @@ static void vnt_interrupt_work(struct work_struct *work) if (priv->vif) vnt_interrupt_process(priv); - MACvIntEnable(priv->PortOffset, IMR_MASK_VALUE); + MACvIntEnable(priv->port_offset, IMR_MASK_VALUE); } static irqreturn_t vnt_interrupt(int irq, void *arg) @@ -1145,7 +1145,7 @@ static irqreturn_t vnt_interrupt(int irq, void *arg) schedule_work(&priv->interrupt_work); - MACvIntDisable(priv->PortOffset); + MACvIntDisable(priv->port_offset); return IRQ_HANDLED; } @@ -1201,9 +1201,9 @@ static int vnt_tx_packet(struct vnt_private *priv, struct sk_buff *skb) wmb(); /* second memory barrier */ if (head_td->td_info->flags & TD_FLAGS_NETIF_SKB) - MACvTransmitAC0(priv->PortOffset); + MACvTransmitAC0(priv->port_offset); else - MACvTransmit0(priv->PortOffset); + MACvTransmit0(priv->port_offset); priv->iTDUsed[dma_idx]++; @@ -1255,7 +1255,7 @@ static int vnt_start(struct ieee80211_hw *hw) device_init_registers(priv); dev_dbg(&priv->pcid->dev, "call MACvIntEnable\n"); - MACvIntEnable(priv->PortOffset, IMR_MASK_VALUE); + MACvIntEnable(priv->port_offset, IMR_MASK_VALUE); ieee80211_wake_queues(hw); @@ -1305,15 +1305,15 @@ static int vnt_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif) case NL80211_IFTYPE_STATION: break; case NL80211_IFTYPE_ADHOC: - MACvRegBitsOff(priv->PortOffset, MAC_REG_RCR, RCR_UNICAST); + MACvRegBitsOff(priv->port_offset, MAC_REG_RCR, RCR_UNICAST); - MACvRegBitsOn(priv->PortOffset, MAC_REG_HOSTCR, HOSTCR_ADHOC); + MACvRegBitsOn(priv->port_offset, MAC_REG_HOSTCR, HOSTCR_ADHOC); break; case NL80211_IFTYPE_AP: - MACvRegBitsOff(priv->PortOffset, MAC_REG_RCR, RCR_UNICAST); + MACvRegBitsOff(priv->port_offset, MAC_REG_RCR, RCR_UNICAST); - MACvRegBitsOn(priv->PortOffset, MAC_REG_HOSTCR, HOSTCR_AP); + MACvRegBitsOn(priv->port_offset, MAC_REG_HOSTCR, HOSTCR_AP); break; default: @@ -1334,16 +1334,16 @@ static void vnt_remove_interface(struct ieee80211_hw *hw, case NL80211_IFTYPE_STATION: break; case NL80211_IFTYPE_ADHOC: - MACvRegBitsOff(priv->PortOffset, MAC_REG_TCR, TCR_AUTOBCNTX); - MACvRegBitsOff(priv->PortOffset, + MACvRegBitsOff(priv->port_offset, MAC_REG_TCR, TCR_AUTOBCNTX); + MACvRegBitsOff(priv->port_offset, MAC_REG_TFTCTL, TFTCTL_TSFCNTREN); - MACvRegBitsOff(priv->PortOffset, MAC_REG_HOSTCR, HOSTCR_ADHOC); + MACvRegBitsOff(priv->port_offset, MAC_REG_HOSTCR, HOSTCR_ADHOC); break; case NL80211_IFTYPE_AP: - MACvRegBitsOff(priv->PortOffset, MAC_REG_TCR, TCR_AUTOBCNTX); - MACvRegBitsOff(priv->PortOffset, + MACvRegBitsOff(priv->port_offset, MAC_REG_TCR, TCR_AUTOBCNTX); + MACvRegBitsOff(priv->port_offset, MAC_REG_TFTCTL, TFTCTL_TSFCNTREN); - MACvRegBitsOff(priv->PortOffset, MAC_REG_HOSTCR, HOSTCR_AP); + MACvRegBitsOff(priv->port_offset, MAC_REG_HOSTCR, HOSTCR_AP); break; default: break; @@ -1407,7 +1407,7 @@ static void vnt_bss_info_changed(struct ieee80211_hw *hw, spin_lock_irqsave(&priv->lock, flags); - MACvWriteBSSIDAddress(priv->PortOffset, (u8 *)conf->bssid); + MACvWriteBSSIDAddress(priv->port_offset, (u8 *)conf->bssid); spin_unlock_irqrestore(&priv->lock, flags); } @@ -1423,19 +1423,19 @@ static void vnt_bss_info_changed(struct ieee80211_hw *hw, if (changed & BSS_CHANGED_ERP_PREAMBLE) { if (conf->use_short_preamble) { - MACvEnableBarkerPreambleMd(priv->PortOffset); priv->byPreambleType = true; + MACvEnableBarkerPreambleMd(priv->port_offset); } else { - MACvDisableBarkerPreambleMd(priv->PortOffset); priv->byPreambleType = false; + MACvDisableBarkerPreambleMd(priv->port_offset); } } if (changed & BSS_CHANGED_ERP_CTS_PROT) { if (conf->use_cts_prot) - MACvEnableProtectMD(priv->PortOffset); + MACvEnableProtectMD(priv->port_offset); else - MACvDisableProtectMD(priv->PortOffset); + MACvDisableProtectMD(priv->port_offset); } if (changed & BSS_CHANGED_ERP_SLOT) { @@ -1459,10 +1459,10 @@ static void vnt_bss_info_changed(struct ieee80211_hw *hw, if (conf->enable_beacon) { vnt_beacon_enable(priv, vif, conf); - MACvRegBitsOn(priv->PortOffset, MAC_REG_TCR, + MACvRegBitsOn(priv->port_offset, MAC_REG_TCR, TCR_AUTOBCNTX); } else { - MACvRegBitsOff(priv->PortOffset, MAC_REG_TCR, + MACvRegBitsOff(priv->port_offset, MAC_REG_TCR, TCR_AUTOBCNTX); } } @@ -1477,9 +1477,9 @@ static void vnt_bss_info_changed(struct ieee80211_hw *hw, CARDvSetFirstNextTBTT(priv, conf->beacon_int); } else { - VNSvOutPortB(priv->PortOffset + MAC_REG_TFTCTL, + VNSvOutPortB(priv->port_offset + MAC_REG_TFTCTL, TFTCTL_TSFCNTRST); - VNSvOutPortB(priv->PortOffset + MAC_REG_TFTCTL, + VNSvOutPortB(priv->port_offset + MAC_REG_TFTCTL, TFTCTL_TSFCNTREN); } } @@ -1513,7 +1513,7 @@ static void vnt_configure(struct ieee80211_hw *hw, *total_flags &= FIF_ALLMULTI | FIF_OTHER_BSS | FIF_BCN_PRBRESP_PROMISC; - VNSvInPortB(priv->PortOffset + MAC_REG_RCR, &rx_mode); + VNSvInPortB(priv->port_offset + MAC_REG_RCR, &rx_mode); dev_dbg(&priv->pcid->dev, "rx mode in = %x\n", rx_mode); @@ -1524,24 +1524,24 @@ static void vnt_configure(struct ieee80211_hw *hw, spin_lock_irqsave(&priv->lock, flags); if (priv->mc_list_count > 2) { - MACvSelectPage1(priv->PortOffset); + MACvSelectPage1(priv->port_offset); - VNSvOutPortD(priv->PortOffset + + VNSvOutPortD(priv->port_offset + MAC_REG_MAR0, 0xffffffff); - VNSvOutPortD(priv->PortOffset + + VNSvOutPortD(priv->port_offset + MAC_REG_MAR0 + 4, 0xffffffff); - MACvSelectPage0(priv->PortOffset); + MACvSelectPage0(priv->port_offset); } else { - MACvSelectPage1(priv->PortOffset); + MACvSelectPage1(priv->port_offset); - VNSvOutPortD(priv->PortOffset + + VNSvOutPortD(priv->port_offset + MAC_REG_MAR0, (u32)multicast); - VNSvOutPortD(priv->PortOffset + + VNSvOutPortD(priv->port_offset + MAC_REG_MAR0 + 4, (u32)(multicast >> 32)); - MACvSelectPage0(priv->PortOffset); + MACvSelectPage0(priv->port_offset); } spin_unlock_irqrestore(&priv->lock, flags); @@ -1561,7 +1561,7 @@ static void vnt_configure(struct ieee80211_hw *hw, rx_mode |= RCR_BSSID; } - VNSvOutPortB(priv->PortOffset + MAC_REG_RCR, rx_mode); + VNSvOutPortB(priv->port_offset + MAC_REG_RCR, rx_mode); dev_dbg(&priv->pcid->dev, "rx mode out= %x\n", rx_mode); } @@ -1621,7 +1621,7 @@ static void vnt_reset_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif) struct vnt_private *priv = hw->priv; /* reset TSF counter */ - VNSvOutPortB(priv->PortOffset + MAC_REG_TFTCTL, TFTCTL_TSFCNTRST); + VNSvOutPortB(priv->port_offset + MAC_REG_TFTCTL, TFTCTL_TSFCNTRST); } static const struct ieee80211_ops vnt_mac_ops = { @@ -1698,9 +1698,9 @@ vt6655_probe(struct pci_dev *pcid, const struct pci_device_id *ent) priv->memaddr = pci_resource_start(pcid, 0); priv->ioaddr = pci_resource_start(pcid, 1); - priv->PortOffset = ioremap(priv->memaddr & PCI_BASE_ADDRESS_MEM_MASK, + priv->port_offset = ioremap(priv->memaddr & PCI_BASE_ADDRESS_MEM_MASK, 256); - if (!priv->PortOffset) { + if (!priv->port_offset) { dev_err(&pcid->dev, ": Failed to IO remapping ..\n"); device_free_info(priv); return -ENODEV; @@ -1729,10 +1729,10 @@ vt6655_probe(struct pci_dev *pcid, const struct pci_device_id *ent) } /* initial to reload eeprom */ MACvInitialize(priv); - MACvReadEtherAddress(priv->PortOffset, priv->abyCurrentNetAddr); + MACvReadEtherAddress(priv->port_offset, priv->abyCurrentNetAddr); /* Get RFType */ - priv->byRFType = SROMbyReadEmbedded(priv->PortOffset, EEP_OFS_RFTYPE); + priv->byRFType = SROMbyReadEmbedded(priv->port_offset, EEP_OFS_RFTYPE); priv->byRFType &= RF_MASK; dev_dbg(&pcid->dev, "RF Type = %x\n", priv->byRFType); diff --git a/drivers/staging/vt6655/mac.c b/drivers/staging/vt6655/mac.c index 9721c2234bf2..1ae7148b4092 100644 --- a/drivers/staging/vt6655/mac.c +++ b/drivers/staging/vt6655/mac.c @@ -57,7 +57,7 @@ bool MACbIsRegBitsOff(struct vnt_private *priv, unsigned char byRegOfs, unsigned char byTestBits) { - void __iomem *io_base = priv->PortOffset; + void __iomem *io_base = priv->port_offset; return !(ioread8(io_base + byRegOfs) & byTestBits); } @@ -77,7 +77,7 @@ bool MACbIsRegBitsOff(struct vnt_private *priv, unsigned char byRegOfs, */ bool MACbIsIntDisable(struct vnt_private *priv) { - void __iomem *io_base = priv->PortOffset; + void __iomem *io_base = priv->port_offset; if (ioread32(io_base + MAC_REG_IMR)) return false; @@ -102,7 +102,7 @@ bool MACbIsIntDisable(struct vnt_private *priv) void MACvSetShortRetryLimit(struct vnt_private *priv, unsigned char byRetryLimit) { - void __iomem *io_base = priv->PortOffset; + void __iomem *io_base = priv->port_offset; /* set SRT */ iowrite8(byRetryLimit, io_base + MAC_REG_SRT); } @@ -124,7 +124,7 @@ void MACvSetShortRetryLimit(struct vnt_private *priv, void MACvSetLongRetryLimit(struct vnt_private *priv, unsigned char byRetryLimit) { - void __iomem *io_base = priv->PortOffset; + void __iomem *io_base = priv->port_offset; /* set LRT */ iowrite8(byRetryLimit, io_base + MAC_REG_LRT); } @@ -145,7 +145,7 @@ void MACvSetLongRetryLimit(struct vnt_private *priv, */ void MACvSetLoopbackMode(struct vnt_private *priv, unsigned char byLoopbackMode) { - void __iomem *io_base = priv->PortOffset; + void __iomem *io_base = priv->port_offset; byLoopbackMode <<= 6; /* set TCR */ @@ -168,7 +168,7 @@ void MACvSetLoopbackMode(struct vnt_private *priv, unsigned char byLoopbackMode) */ void MACvSaveContext(struct vnt_private *priv, unsigned char *cxt_buf) { - void __iomem *io_base = priv->PortOffset; + void __iomem *io_base = priv->port_offset; /* read page0 register */ memcpy_fromio(cxt_buf, io_base, MAC_MAX_CONTEXT_SIZE_PAGE0); @@ -198,7 +198,7 @@ void MACvSaveContext(struct vnt_private *priv, unsigned char *cxt_buf) */ void MACvRestoreContext(struct vnt_private *priv, unsigned char *cxt_buf) { - void __iomem *io_base = priv->PortOffset; + void __iomem *io_base = priv->port_offset; MACvSelectPage1(io_base); /* restore page1 */ @@ -249,7 +249,7 @@ void MACvRestoreContext(struct vnt_private *priv, unsigned char *cxt_buf) */ bool MACbSoftwareReset(struct vnt_private *priv) { - void __iomem *io_base = priv->PortOffset; + void __iomem *io_base = priv->port_offset; unsigned short ww; /* turn on HOSTCR_SOFTRST, just write 0x01 to reset */ @@ -312,7 +312,7 @@ bool MACbSafeSoftwareReset(struct vnt_private *priv) */ bool MACbSafeRxOff(struct vnt_private *priv) { - void __iomem *io_base = priv->PortOffset; + void __iomem *io_base = priv->port_offset; unsigned short ww; /* turn off wow temp for turn off Rx safely */ @@ -366,7 +366,7 @@ bool MACbSafeRxOff(struct vnt_private *priv) */ bool MACbSafeTxOff(struct vnt_private *priv) { - void __iomem *io_base = priv->PortOffset; + void __iomem *io_base = priv->port_offset; unsigned short ww; /* Clear TX DMA */ @@ -422,7 +422,7 @@ bool MACbSafeTxOff(struct vnt_private *priv) */ bool MACbSafeStop(struct vnt_private *priv) { - void __iomem *io_base = priv->PortOffset; + void __iomem *io_base = priv->port_offset; MACvRegBitsOff(io_base, MAC_REG_TCR, TCR_AUTOBCNTX); @@ -457,7 +457,7 @@ bool MACbSafeStop(struct vnt_private *priv) */ bool MACbShutdown(struct vnt_private *priv) { - void __iomem *io_base = priv->PortOffset; + void __iomem *io_base = priv->port_offset; /* disable MAC IMR */ MACvIntDisable(io_base); MACvSetLoopbackMode(priv, MAC_LB_INTERNAL); @@ -485,7 +485,7 @@ bool MACbShutdown(struct vnt_private *priv) */ void MACvInitialize(struct vnt_private *priv) { - void __iomem *io_base = priv->PortOffset; + void __iomem *io_base = priv->port_offset; /* clear sticky bits */ MACvClearStckDS(io_base); /* disable force PME-enable */ @@ -517,7 +517,7 @@ void MACvInitialize(struct vnt_private *priv) */ void MACvSetCurrRx0DescAddr(struct vnt_private *priv, u32 curr_desc_addr) { - void __iomem *io_base = priv->PortOffset; + void __iomem *io_base = priv->port_offset; unsigned short ww; unsigned char org_dma_ctl; @@ -551,7 +551,7 @@ void MACvSetCurrRx0DescAddr(struct vnt_private *priv, u32 curr_desc_addr) */ void MACvSetCurrRx1DescAddr(struct vnt_private *priv, u32 curr_desc_addr) { - void __iomem *io_base = priv->PortOffset; + void __iomem *io_base = priv->port_offset; unsigned short ww; unsigned char org_dma_ctl; @@ -586,7 +586,7 @@ void MACvSetCurrRx1DescAddr(struct vnt_private *priv, u32 curr_desc_addr) void MACvSetCurrTx0DescAddrEx(struct vnt_private *priv, u32 curr_desc_addr) { - void __iomem *io_base = priv->PortOffset; + void __iomem *io_base = priv->port_offset; unsigned short ww; unsigned char org_dma_ctl; @@ -622,7 +622,7 @@ void MACvSetCurrTx0DescAddrEx(struct vnt_private *priv, void MACvSetCurrAC0DescAddrEx(struct vnt_private *priv, u32 curr_desc_addr) { - void __iomem *io_base = priv->PortOffset; + void __iomem *io_base = priv->port_offset; unsigned short ww; unsigned char org_dma_ctl; @@ -666,7 +666,7 @@ void MACvSetCurrTXDescAddr(int iTxType, struct vnt_private *priv, */ void MACvTimer0MicroSDelay(struct vnt_private *priv, unsigned int uDelay) { - void __iomem *io_base = priv->PortOffset; + void __iomem *io_base = priv->port_offset; unsigned char byValue; unsigned int uu, ii; @@ -703,7 +703,7 @@ void MACvTimer0MicroSDelay(struct vnt_private *priv, unsigned int uDelay) void MACvOneShotTimer1MicroSec(struct vnt_private *priv, unsigned int uDelayTime) { - void __iomem *io_base = priv->PortOffset; + void __iomem *io_base = priv->port_offset; iowrite8(0, io_base + MAC_REG_TMCTL1); iowrite32(uDelayTime, io_base + MAC_REG_TMDATA1); @@ -713,7 +713,7 @@ void MACvOneShotTimer1MicroSec(struct vnt_private *priv, void MACvSetMISCFifo(struct vnt_private *priv, unsigned short offset, u32 data) { - void __iomem *io_base = priv->PortOffset; + void __iomem *io_base = priv->port_offset; if (offset > 273) return; @@ -724,7 +724,7 @@ void MACvSetMISCFifo(struct vnt_private *priv, unsigned short offset, bool MACbPSWakeup(struct vnt_private *priv) { - void __iomem *io_base = priv->PortOffset; + void __iomem *io_base = priv->port_offset; unsigned int ww; /* Read PSCTL */ if (MACbIsRegBitsOff(priv, MAC_REG_PSCTL, PSCTL_PS)) @@ -765,7 +765,7 @@ void MACvSetKeyEntry(struct vnt_private *priv, unsigned short wKeyCtl, unsigned char *pbyAddr, u32 *pdwKey, unsigned char byLocalID) { - void __iomem *io_base = priv->PortOffset; + void __iomem *io_base = priv->port_offset; unsigned short offset; u32 data; int ii; @@ -830,7 +830,7 @@ void MACvSetKeyEntry(struct vnt_private *priv, unsigned short wKeyCtl, */ void MACvDisableKeyEntry(struct vnt_private *priv, unsigned int uEntryIdx) { - void __iomem *io_base = priv->PortOffset; + void __iomem *io_base = priv->port_offset; unsigned short offset; offset = MISCFIFO_KEYETRY0; diff --git a/drivers/staging/vt6655/power.c b/drivers/staging/vt6655/power.c index aac021e983d1..06066fa56dd5 100644 --- a/drivers/staging/vt6655/power.c +++ b/drivers/staging/vt6655/power.c @@ -52,30 +52,30 @@ void PSvEnablePowerSaving(struct vnt_private *priv, u16 wAID = priv->current_aid | BIT(14) | BIT(15); /* set period of power up before TBTT */ - VNSvOutPortW(priv->PortOffset + MAC_REG_PWBT, C_PWBT); + VNSvOutPortW(priv->port_offset + MAC_REG_PWBT, C_PWBT); if (priv->op_mode != NL80211_IFTYPE_ADHOC) { /* set AID */ - VNSvOutPortW(priv->PortOffset + MAC_REG_AIDATIM, wAID); + VNSvOutPortW(priv->port_offset + MAC_REG_AIDATIM, wAID); } /* Set AutoSleep */ - MACvRegBitsOn(priv->PortOffset, MAC_REG_PSCFG, PSCFG_AUTOSLEEP); + MACvRegBitsOn(priv->port_offset, MAC_REG_PSCFG, PSCFG_AUTOSLEEP); /* Set HWUTSF */ - MACvRegBitsOn(priv->PortOffset, MAC_REG_TFTCTL, TFTCTL_HWUTSF); + MACvRegBitsOn(priv->port_offset, MAC_REG_TFTCTL, TFTCTL_HWUTSF); if (wListenInterval >= 2) { /* clear always listen beacon */ - MACvRegBitsOff(priv->PortOffset, MAC_REG_PSCTL, PSCTL_ALBCN); + MACvRegBitsOff(priv->port_offset, MAC_REG_PSCTL, PSCTL_ALBCN); /* first time set listen next beacon */ - MACvRegBitsOn(priv->PortOffset, MAC_REG_PSCTL, PSCTL_LNBCN); + MACvRegBitsOn(priv->port_offset, MAC_REG_PSCTL, PSCTL_LNBCN); } else { /* always listen beacon */ - MACvRegBitsOn(priv->PortOffset, MAC_REG_PSCTL, PSCTL_ALBCN); + MACvRegBitsOn(priv->port_offset, MAC_REG_PSCTL, PSCTL_ALBCN); } /* enable power saving hw function */ - MACvRegBitsOn(priv->PortOffset, MAC_REG_PSCTL, PSCTL_PSEN); + MACvRegBitsOn(priv->port_offset, MAC_REG_PSCTL, PSCTL_PSEN); priv->bEnablePSMode = true; priv->bPWBitOn = true; @@ -98,13 +98,13 @@ void PSvDisablePowerSaving(struct vnt_private *priv) MACbPSWakeup(priv); /* clear AutoSleep */ - MACvRegBitsOff(priv->PortOffset, MAC_REG_PSCFG, PSCFG_AUTOSLEEP); + MACvRegBitsOff(priv->port_offset, MAC_REG_PSCFG, PSCFG_AUTOSLEEP); /* clear HWUTSF */ - MACvRegBitsOff(priv->PortOffset, MAC_REG_TFTCTL, TFTCTL_HWUTSF); + MACvRegBitsOff(priv->port_offset, MAC_REG_TFTCTL, TFTCTL_HWUTSF); /* set always listen beacon */ - MACvRegBitsOn(priv->PortOffset, MAC_REG_PSCTL, PSCTL_ALBCN); + MACvRegBitsOn(priv->port_offset, MAC_REG_PSCTL, PSCTL_ALBCN); priv->bEnablePSMode = false; @@ -135,7 +135,7 @@ bool PSbIsNextTBTTWakeUp(struct vnt_private *priv) if (priv->wake_up_count == 1) { /* Turn on wake up to listen next beacon */ - MACvRegBitsOn(priv->PortOffset, + MACvRegBitsOn(priv->port_offset, MAC_REG_PSCTL, PSCTL_LNBCN); wake_up = true; } diff --git a/drivers/staging/vt6655/rf.c b/drivers/staging/vt6655/rf.c index 0dae593c6944..a6f17162d017 100644 --- a/drivers/staging/vt6655/rf.c +++ b/drivers/staging/vt6655/rf.c @@ -406,7 +406,7 @@ static const unsigned long dwAL7230ChannelTable2[CB_MAX_CHANNEL] = { */ static bool s_bAL7230Init(struct vnt_private *priv) { - void __iomem *iobase = priv->PortOffset; + void __iomem *iobase = priv->port_offset; int ii; bool ret; @@ -455,7 +455,7 @@ static bool s_bAL7230Init(struct vnt_private *priv) */ static bool s_bAL7230SelectChannel(struct vnt_private *priv, unsigned char byChannel) { - void __iomem *iobase = priv->PortOffset; + void __iomem *iobase = priv->port_offset; bool ret; ret = true; @@ -494,7 +494,7 @@ static bool s_bAL7230SelectChannel(struct vnt_private *priv, unsigned char byCha */ bool IFRFbWriteEmbedded(struct vnt_private *priv, unsigned long dwData) { - void __iomem *iobase = priv->PortOffset; + void __iomem *iobase = priv->port_offset; unsigned short ww; unsigned long dwValue; @@ -527,7 +527,7 @@ bool IFRFbWriteEmbedded(struct vnt_private *priv, unsigned long dwData) */ static bool RFbAL2230Init(struct vnt_private *priv) { - void __iomem *iobase = priv->PortOffset; + void __iomem *iobase = priv->port_offset; int ii; bool ret; @@ -572,7 +572,7 @@ static bool RFbAL2230Init(struct vnt_private *priv) static bool RFbAL2230SelectChannel(struct vnt_private *priv, unsigned char byChannel) { - void __iomem *iobase = priv->PortOffset; + void __iomem *iobase = priv->port_offset; bool ret; ret = true; @@ -679,7 +679,7 @@ bool RFbSelectChannel(struct vnt_private *priv, unsigned char byRFType, bool RFvWriteWakeProgSyn(struct vnt_private *priv, unsigned char byRFType, u16 uChannel) { - void __iomem *iobase = priv->PortOffset; + void __iomem *iobase = priv->port_offset; int ii; unsigned char byInitCount = 0; unsigned char bySleepCount = 0; diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c index 5395c3a3e35a..7ec7fd309329 100644 --- a/drivers/staging/vt6655/rxtx.c +++ b/drivers/staging/vt6655/rxtx.c @@ -1422,13 +1422,13 @@ static int vnt_beacon_xmit(struct vnt_private *priv, priv->wBCNBufLen = sizeof(*short_head) + skb->len; - MACvSetCurrBCNTxDescAddr(priv->PortOffset, priv->tx_beacon_dma); + MACvSetCurrBCNTxDescAddr(priv->port_offset, priv->tx_beacon_dma); - MACvSetCurrBCNLength(priv->PortOffset, priv->wBCNBufLen); + MACvSetCurrBCNLength(priv->port_offset, priv->wBCNBufLen); /* Set auto Transmit on */ - MACvRegBitsOn(priv->PortOffset, MAC_REG_TCR, TCR_AUTOBCNTX); + MACvRegBitsOn(priv->port_offset, MAC_REG_TCR, TCR_AUTOBCNTX); /* Poll Transmit the adapter */ - MACvTransmitBCN(priv->PortOffset); + MACvTransmitBCN(priv->port_offset); return 0; } @@ -1452,9 +1452,9 @@ int vnt_beacon_make(struct vnt_private *priv, struct ieee80211_vif *vif) int vnt_beacon_enable(struct vnt_private *priv, struct ieee80211_vif *vif, struct ieee80211_bss_conf *conf) { - VNSvOutPortB(priv->PortOffset + MAC_REG_TFTCTL, TFTCTL_TSFCNTRST); + VNSvOutPortB(priv->port_offset + MAC_REG_TFTCTL, TFTCTL_TSFCNTRST); - VNSvOutPortB(priv->PortOffset + MAC_REG_TFTCTL, TFTCTL_TSFCNTREN); + VNSvOutPortB(priv->port_offset + MAC_REG_TFTCTL, TFTCTL_TSFCNTREN); CARDvSetFirstNextTBTT(priv, conf->beacon_int); -- 2.25.1 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH v2 3/3] staging: vt6655: replace camel case port_offset instead of PortOffset. 2021-09-24 21:00 ` Tommaso Merciai (?) @ 2021-09-24 21:56 ` Gustavo A. R. Silva 2021-09-24 22:01 ` Tommaso Merciai -1 siblings, 1 reply; 13+ messages in thread From: Gustavo A. R. Silva @ 2021-09-24 21:56 UTC (permalink / raw) To: Tommaso Merciai Cc: Forest Bond, Greg Kroah-Hartman, Madhumitha Prabakaran, Yujia Qiao, Lucas Henneman, Marcos Antonio de Jesus Filho, Edmundo Carmona Antoranz, Aldas Taraškevičius, Gustavo A. R. Silva, Deepak R Varma, linux-staging, linux-kernel On 9/24/21 16:00, Tommaso Merciai wrote: Where is the changelog text? :/ Sorry but I insist: take a look at this: https://kernelnewbies.org/Outreachyfirstpatch Thanks -- Gustavo > Signed-off-by: Tommaso Merciai <tomm.merciai@gmail.com> ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v2 3/3] staging: vt6655: replace camel case port_offset instead of PortOffset. 2021-09-24 21:56 ` Gustavo A. R. Silva @ 2021-09-24 22:01 ` Tommaso Merciai 2021-09-24 22:15 ` Gustavo A. R. Silva 0 siblings, 1 reply; 13+ messages in thread From: Tommaso Merciai @ 2021-09-24 22:01 UTC (permalink / raw) To: Gustavo A. R. Silva Cc: Forest Bond, Greg Kroah-Hartman, Madhumitha Prabakaran, Yujia Qiao, Lucas Henneman, Marcos Antonio de Jesus Filho, Edmundo Carmona Antoranz, Aldas Taraškevičius, Gustavo A. R. Silva, Deepak R Varma, linux-staging, linux-kernel On Fri, Sep 24, 2021 at 04:56:16PM -0500, Gustavo A. R. Silva wrote: > > > On 9/24/21 16:00, Tommaso Merciai wrote: > > Where is the changelog text? :/ > > Sorry but I insist: take a look at this: > > https://kernelnewbies.org/Outreachyfirstpatch Hi Gustavo, You mean the changelog in the cover letter? Thanks. Tommaso > > Thanks > -- > Gustavo > > > Signed-off-by: Tommaso Merciai <tomm.merciai@gmail.com> ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v2 3/3] staging: vt6655: replace camel case port_offset instead of PortOffset. 2021-09-24 22:01 ` Tommaso Merciai @ 2021-09-24 22:15 ` Gustavo A. R. Silva 2021-09-24 22:18 ` Tommaso Merciai 0 siblings, 1 reply; 13+ messages in thread From: Gustavo A. R. Silva @ 2021-09-24 22:15 UTC (permalink / raw) To: Tommaso Merciai Cc: Forest Bond, Greg Kroah-Hartman, Madhumitha Prabakaran, Yujia Qiao, Lucas Henneman, Marcos Antonio de Jesus Filho, Edmundo Carmona Antoranz, Aldas Taraškevičius, Gustavo A. R. Silva, Deepak R Varma, linux-staging, linux-kernel On 9/24/21 17:01, Tommaso Merciai wrote: > On Fri, Sep 24, 2021 at 04:56:16PM -0500, Gustavo A. R. Silva wrote: >> >> >> On 9/24/21 16:00, Tommaso Merciai wrote: >> >> Where is the changelog text? :/ >> >> Sorry but I insist: take a look at this: >> >> https://kernelnewbies.org/Outreachyfirstpatch > > Hi Gustavo, > You mean the changelog in the cover letter? That's not how it works. :) What's the hurry? Check section "Versioning one patch revision" and then read the whole thing, so you can learn how to smoothly land as many patches as you want: https://kernelnewbies.org/Outreachyfirstpatch -- Gustavo > > Thanks. > Tommaso >> >> Thanks >> -- >> Gustavo >> >>> Signed-off-by: Tommaso Merciai <tomm.merciai@gmail.com> ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v2 3/3] staging: vt6655: replace camel case port_offset instead of PortOffset. 2021-09-24 22:15 ` Gustavo A. R. Silva @ 2021-09-24 22:18 ` Tommaso Merciai 0 siblings, 0 replies; 13+ messages in thread From: Tommaso Merciai @ 2021-09-24 22:18 UTC (permalink / raw) To: Gustavo A. R. Silva Cc: Forest Bond, Greg Kroah-Hartman, Madhumitha Prabakaran, Yujia Qiao, Lucas Henneman, Marcos Antonio de Jesus Filho, Edmundo Carmona Antoranz, Aldas Taraškevičius, Gustavo A. R. Silva, Deepak R Varma, linux-staging, linux-kernel On Fri, Sep 24, 2021 at 05:15:46PM -0500, Gustavo A. R. Silva wrote: > > > On 9/24/21 17:01, Tommaso Merciai wrote: > > On Fri, Sep 24, 2021 at 04:56:16PM -0500, Gustavo A. R. Silva wrote: > >> > >> > >> On 9/24/21 16:00, Tommaso Merciai wrote: > >> > >> Where is the changelog text? :/ > >> > >> Sorry but I insist: take a look at this: > >> > >> https://kernelnewbies.org/Outreachyfirstpatch > > > > Hi Gustavo, > > You mean the changelog in the cover letter? > > That's not how it works. :) > > What's the hurry? > Check section "Versioning one patch revision" and then read the > whole thing, so you can learn how to smoothly land as many patches > as you want: > > https://kernelnewbies.org/Outreachyfirstpatch > > -- > Gustavo Hi Gustavo, Thanks again for your time. I will read it and retry. Tommaso > > > > > Thanks. > > Tommaso > >> > >> Thanks > >> -- > >> Gustavo > >> > >>> Signed-off-by: Tommaso Merciai <tomm.merciai@gmail.com> ^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2021-09-25 6:16 UTC | newest] Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2021-09-24 20:59 [PATCH v2 0/3] staging: vt6655: replace camel case variables Tommaso Merciai 2021-09-24 20:59 ` Tommaso Merciai 2021-09-24 21:00 ` [PATCH v2 1/3] staging: vt6655: replace camel case b_short_slot_time instead of bShortSlotTime Tommaso Merciai 2021-09-24 21:00 ` Tommaso Merciai 2021-09-25 6:16 ` Greg Kroah-Hartman 2021-09-24 21:00 ` [PATCH v2 2/3] staging: vt6655: replace camel case ld_bm_threshold instead of ldBmThreshold Tommaso Merciai 2021-09-24 21:00 ` Tommaso Merciai 2021-09-24 21:00 ` [PATCH v2 3/3] staging: vt6655: replace camel case port_offset instead of PortOffset Tommaso Merciai 2021-09-24 21:00 ` Tommaso Merciai 2021-09-24 21:56 ` Gustavo A. R. Silva 2021-09-24 22:01 ` Tommaso Merciai 2021-09-24 22:15 ` Gustavo A. R. Silva 2021-09-24 22:18 ` Tommaso Merciai
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.