[PATCH] drivers/net/wireless/b43/main.c:4351: Fixed coding style

[PATCH] drivers/net/wireless/b43/main.c:4351: Fixed coding style

[Daniel Ngu]

WARNING: braces {} are not necessary for any arm of this statement

Signed-off-by: Daniel Ngu <daniel.dy.ngu@gmail.com>
---
 drivers/net/wireless/b43/main.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 1521b1e..14cf3bd 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -4348,11 +4348,10 @@ static int b43_wireless_core_init(struct b43_wldev *dev)
 	b43_set_phytxctl_defaults(dev);
 
 	/* Minimum Contention Window */
-	if (phy->type == B43_PHYTYPE_B) {
+	if (phy->type == B43_PHYTYPE_B)
 		b43_shm_write16(dev, B43_SHM_SCRATCH, B43_SHM_SC_MINCONT, 0x1F);
-	} else {
+	else
 		b43_shm_write16(dev, B43_SHM_SCRATCH, B43_SHM_SC_MINCONT, 0xF);
-	}
 	/* Maximum Contention Window */
 	b43_shm_write16(dev, B43_SHM_SCRATCH, B43_SHM_SC_MAXCONT, 0x3FF);
 
-- 
1.5.6.5

Re: [PATCH] drivers/net/wireless/b43/main.c:4351: Fixed coding style

[Gábor Stefanik]

On Mon, Mar 22, 2010 at 12:52 PM, Daniel Ngu <daniel.dy.ngu@gmail.com> wrote:
> WARNING: braces {} are not necessary for any arm of this statement
>
> Signed-off-by: Daniel Ngu <daniel.dy.ngu@gmail.com>
> ---
>  drivers/net/wireless/b43/main.c |    5 ++---
>  1 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
> index 1521b1e..14cf3bd 100644
> --- a/drivers/net/wireless/b43/main.c
> +++ b/drivers/net/wireless/b43/main.c
> @@ -4348,11 +4348,10 @@ static int b43_wireless_core_init(struct b43_wldev *dev)
>        b43_set_phytxctl_defaults(dev);
>
>        /* Minimum Contention Window */
> -       if (phy->type == B43_PHYTYPE_B) {
> +       if (phy->type == B43_PHYTYPE_B)
>                b43_shm_write16(dev, B43_SHM_SCRATCH, B43_SHM_SC_MINCONT, 0x1F);
> -       } else {
> +       else
>                b43_shm_write16(dev, B43_SHM_SCRATCH, B43_SHM_SC_MINCONT, 0xF);
> -       }
>        /* Maximum Contention Window */
>        b43_shm_write16(dev, B43_SHM_SCRATCH, B43_SHM_SC_MAXCONT, 0x3FF);
>
> --
> 1.5.6.5
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>

Actually I believe the entire PHYTYPE_B brahcn could be removed, as we
no longer have B-PHY support in b43 anyway. But consult Michael about
this.

--
Vista: [V]iruses, [I]ntruders, [S]pyware, [T]rojans and [A]dware. :-)