Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1637313 > unrolled thread
| Started by | Surender Polsani <surenderpolsani@gmail.com> |
|---|---|
| First post | 2017-05-08 10:50 +0200 |
| Last post | 2017-05-09 10:10 +0200 |
| Articles | 3 — 3 participants |
Back to article view | Back to linux.kernel
[PATCH] staging : rtl8188eu : remove unnecessary else Surender Polsani <surenderpolsani@gmail.com> - 2017-05-08 10:50 +0200
Re: [PATCH] staging : rtl8188eu : remove unnecessary else Joe Perches <joe@perches.com> - 2017-05-08 21:50 +0200
Re: [PATCH] staging : rtl8188eu : remove unnecessary else Dan Carpenter <dan.carpenter@oracle.com> - 2017-05-09 10:10 +0200
| From | Surender Polsani <surenderpolsani@gmail.com> |
|---|---|
| Date | 2017-05-08 10:50 +0200 |
| Subject | [PATCH] staging : rtl8188eu : remove unnecessary else |
| Message-ID | <tEMwG-1z9-15@gated-at.bofh.it> |
according to coding style else is not generally
useful after a break or return
Signed-off-by: Surender Polsani <surenderpolsani@gmail.com>
---
drivers/staging/rtl8188eu/hal/rtl8188e_dm.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/staging/rtl8188eu/hal/rtl8188e_dm.c b/drivers/staging/rtl8188eu/hal/rtl8188e_dm.c
index d04b7fb..7420f55 100644
--- a/drivers/staging/rtl8188eu/hal/rtl8188e_dm.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188e_dm.c
@@ -212,8 +212,7 @@ u8 rtw_hal_antdiv_before_linked(struct adapter *Adapter)
rtw_antenna_select_cmd(Adapter, dm_swat_tbl->CurAntenna, false);
return true;
- } else {
+ }
dm_swat_tbl->SWAS_NoLink_State = 0;
return false;
- }
}
--
1.9.1
[toc] | [next] | [standalone]
| From | Joe Perches <joe@perches.com> |
|---|---|
| Date | 2017-05-08 21:50 +0200 |
| Message-ID | <tEWPo-8b6-13@gated-at.bofh.it> |
| In reply to | #1637313 |
On Mon, 2017-05-08 at 14:13 +0530, Surender Polsani wrote:
> according to coding style else is not generally
> useful after a break or return
>
> Signed-off-by: Surender Polsani <surenderpolsani@gmail.com>
> ---
> drivers/staging/rtl8188eu/hal/rtl8188e_dm.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/staging/rtl8188eu/hal/rtl8188e_dm.c b/drivers/staging/rtl8188eu/hal/rtl8188e_dm.c
> index d04b7fb..7420f55 100644
> --- a/drivers/staging/rtl8188eu/hal/rtl8188e_dm.c
> +++ b/drivers/staging/rtl8188eu/hal/rtl8188e_dm.c
> @@ -212,8 +212,7 @@ u8 rtw_hal_antdiv_before_linked(struct adapter *Adapter)
>
> rtw_antenna_select_cmd(Adapter, dm_swat_tbl->CurAntenna, false);
> return true;
> - } else {
> + }
> dm_swat_tbl->SWAS_NoLink_State = 0;
> return false;
> - }
> }
It's just fine how else after return is used here.
In the future you should reflow indentation after
removing braces though.
The function might be restructured a bit to return
false before ever returning true.
Something like:
---
drivers/staging/rtl8188eu/hal/rtl8188e_dm.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/rtl8188eu/hal/rtl8188e_dm.c b/drivers/staging/rtl8188eu/hal/rtl8188e_dm.c
index d04b7fbb71e1..1de9bcaa58b8 100644
--- a/drivers/staging/rtl8188eu/hal/rtl8188e_dm.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188e_dm.c
@@ -198,22 +198,22 @@ u8 rtw_hal_antdiv_before_linked(struct adapter *Adapter)
struct sw_ant_switch *dm_swat_tbl = &dm_odm->DM_SWAT_Table;
struct mlme_priv *pmlmepriv = &(Adapter->mlmepriv);
- /* Condition that does not need to use antenna diversity. */
+ /* Condition that does not need to use antenna diversity */
if (Adapter->HalData->AntDivCfg == 0)
return false;
if (check_fwstate(pmlmepriv, _FW_LINKED))
return false;
- if (dm_swat_tbl->SWAS_NoLink_State == 0) {
- /* switch channel */
- dm_swat_tbl->SWAS_NoLink_State = 1;
- dm_swat_tbl->CurAntenna = (dm_swat_tbl->CurAntenna == Antenna_A) ? Antenna_B : Antenna_A;
-
- rtw_antenna_select_cmd(Adapter, dm_swat_tbl->CurAntenna, false);
- return true;
- } else {
+ if (dm_swat_tbl->SWAS_NoLink_State != 0) {
dm_swat_tbl->SWAS_NoLink_State = 0;
return false;
}
+
+ /* switch channel */
+ dm_swat_tbl->SWAS_NoLink_State = 1;
+ dm_swat_tbl->CurAntenna = dm_swat_tbl->CurAntenna == Antenna_A ? Antenna_B : Antenna_A;
+ rtw_antenna_select_cmd(Adapter, dm_swat_tbl->CurAntenna, false);
+
+ return true;
}
[toc] | [prev] | [next] | [standalone]
| From | Dan Carpenter <dan.carpenter@oracle.com> |
|---|---|
| Date | 2017-05-09 10:10 +0200 |
| Message-ID | <tF8nv-7up-1@gated-at.bofh.it> |
| In reply to | #1637313 |
On Mon, May 08, 2017 at 02:13:00PM +0530, Surender Polsani wrote:
> according to coding style else is not generally
> useful after a break or return
>
> Signed-off-by: Surender Polsani <surenderpolsani@gmail.com>
> ---
> drivers/staging/rtl8188eu/hal/rtl8188e_dm.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/staging/rtl8188eu/hal/rtl8188e_dm.c b/drivers/staging/rtl8188eu/hal/rtl8188e_dm.c
> index d04b7fb..7420f55 100644
> --- a/drivers/staging/rtl8188eu/hal/rtl8188e_dm.c
> +++ b/drivers/staging/rtl8188eu/hal/rtl8188e_dm.c
> @@ -212,8 +212,7 @@ u8 rtw_hal_antdiv_before_linked(struct adapter *Adapter)
>
> rtw_antenna_select_cmd(Adapter, dm_swat_tbl->CurAntenna, false);
> return true;
> - } else {
> + }
> dm_swat_tbl->SWAS_NoLink_State = 0;
> return false;
> - }
Nope.
I think you really need to learn C programming before you send any more
patches.
regards,
dan carpenter
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web