[PATCH 08/10] ath9k: add block braces to match indentation

[PATCH 08/10] ath9k: add block braces to match indentation

[Ilpo Järvinen]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 930 bytes --]


This isn't a behavior problem as is, and fixing indentation
inconsistency either way would be fine (reindent or braces).

Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
---
 drivers/net/wireless/ath9k/main.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drivers/net/wireless/ath9k/main.c b/drivers/net/wireless/ath9k/main.c
index f05f584..0f67b1b 100644
--- a/drivers/net/wireless/ath9k/main.c
+++ b/drivers/net/wireless/ath9k/main.c
@@ -467,9 +467,10 @@ void ath_tx_complete(struct ath_softc *sc, struct sk_buff *skb,
 	if (tx_info->flags & IEEE80211_TX_CTL_NO_ACK ||
 		tx_info->flags & IEEE80211_TX_STAT_TX_FILTERED) {
 		/* free driver's private data area of tx_info */
-		if (tx_info->driver_data[0] != NULL)
+		if (tx_info->driver_data[0] != NULL) {
 			kfree(tx_info->driver_data[0]);
 			tx_info->driver_data[0] = NULL;
+		}
 	}
 
 	if (tx_status->flags & ATH_TX_BAR) {
-- 
1.5.2.2

[PATCH 09/10] b43legacy: reindent misleading statement

[Ilpo Järvinen]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 711 bytes --]


Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
---
 drivers/net/wireless/b43legacy/dma.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/wireless/b43legacy/dma.c b/drivers/net/wireless/b43legacy/dma.c
index fb6819e..786e028 100644
--- a/drivers/net/wireless/b43legacy/dma.c
+++ b/drivers/net/wireless/b43legacy/dma.c
@@ -919,7 +919,7 @@ struct b43legacy_dmaring *b43legacy_setup_dmaring(struct b43legacy_wldev *dev,
 			if (!ring->txhdr_cache)
 				goto err_kfree_meta;
 
-				dma_test = ssb_dma_map_single(dev->dev,
+			dma_test = ssb_dma_map_single(dev->dev,
 					ring->txhdr_cache,
 					sizeof(struct b43legacy_txhdr_fw3),
 					DMA_TO_DEVICE);
-- 
1.5.2.2

Re: [PATCH 08/10] ath9k: add block braces to match indentation

[Johannes Berg]

[-- Attachment #1: Type: text/plain, Size: 1178 bytes --]

On Thu, 2008-10-30 at 13:41 +0200, Ilpo Järvinen wrote:
> This isn't a behavior problem as is, and fixing indentation
> inconsistency either way would be fine (reindent or braces).
> 
> Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
> ---
>  drivers/net/wireless/ath9k/main.c |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/net/wireless/ath9k/main.c b/drivers/net/wireless/ath9k/main.c
> index f05f584..0f67b1b 100644
> --- a/drivers/net/wireless/ath9k/main.c
> +++ b/drivers/net/wireless/ath9k/main.c
> @@ -467,9 +467,10 @@ void ath_tx_complete(struct ath_softc *sc, struct sk_buff *skb,
>  	if (tx_info->flags & IEEE80211_TX_CTL_NO_ACK ||
>  		tx_info->flags & IEEE80211_TX_STAT_TX_FILTERED) {
>  		/* free driver's private data area of tx_info */
> -		if (tx_info->driver_data[0] != NULL)
> +		if (tx_info->driver_data[0] != NULL) {
>  			kfree(tx_info->driver_data[0]);
>  			tx_info->driver_data[0] = NULL;
> +		}

Since kfree(NULL) is fine, how about just removing the if? Also, this
code has been removed in a recent change in the wireless tree, I think
(the rate control revamp)

johannes

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH 08/10] ath9k: add block braces to match indentation

[Ilpo Järvinen]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 1548 bytes --]

On Thu, 30 Oct 2008, Johannes Berg wrote:

> On Thu, 2008-10-30 at 13:41 +0200, Ilpo Järvinen wrote:
> > This isn't a behavior problem as is, and fixing indentation
> > inconsistency either way would be fine (reindent or braces).
> > 
> > Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
> > ---
> >  drivers/net/wireless/ath9k/main.c |    3 ++-
> >  1 files changed, 2 insertions(+), 1 deletions(-)
> > 
> > diff --git a/drivers/net/wireless/ath9k/main.c b/drivers/net/wireless/ath9k/main.c
> > index f05f584..0f67b1b 100644
> > --- a/drivers/net/wireless/ath9k/main.c
> > +++ b/drivers/net/wireless/ath9k/main.c
> > @@ -467,9 +467,10 @@ void ath_tx_complete(struct ath_softc *sc, struct sk_buff *skb,
> >  	if (tx_info->flags & IEEE80211_TX_CTL_NO_ACK ||
> >  		tx_info->flags & IEEE80211_TX_STAT_TX_FILTERED) {
> >  		/* free driver's private data area of tx_info */
> > -		if (tx_info->driver_data[0] != NULL)
> > +		if (tx_info->driver_data[0] != NULL) {
> >  			kfree(tx_info->driver_data[0]);
> >  			tx_info->driver_data[0] = NULL;
> > +		}
> 
> Since kfree(NULL) is fine, how about just removing the if?

Agreed. I had perhaps done too many of these already when I came to this 
one and failed to notice such obviousness... :-)

> Also, this code has been removed in a recent change in the wireless 
> tree, I think (the rate control revamp)

Ok. A bit hard for me to track all the upcoming changes tree wide, I once 
did this kind of things in -next but since it had the break recently I 
didn't remember to return to it.

-- 
 i.

Re: [PATCH 08/10] ath9k: add block braces to match indentation

[Johannes Berg]

[-- Attachment #1: Type: text/plain, Size: 1296 bytes --]

On Thu, 2008-10-30 at 19:59 +0530, Sujith wrote:
> Johannes Berg wrote:
> > > diff --git a/drivers/net/wireless/ath9k/main.c b/drivers/net/wireless/ath9k/main.c
> > > index f05f584..0f67b1b 100644
> > > --- a/drivers/net/wireless/ath9k/main.c
> > > +++ b/drivers/net/wireless/ath9k/main.c
> > > @@ -467,9 +467,10 @@ void ath_tx_complete(struct ath_softc *sc, struct sk_buff *skb,
> > >  	if (tx_info->flags & IEEE80211_TX_CTL_NO_ACK ||
> > >  		tx_info->flags & IEEE80211_TX_STAT_TX_FILTERED) {
> > >  		/* free driver's private data area of tx_info */
> > > -		if (tx_info->driver_data[0] != NULL)
> > > +		if (tx_info->driver_data[0] != NULL) {
> > >  			kfree(tx_info->driver_data[0]);
> > >  			tx_info->driver_data[0] = NULL;
> > > +		}
> > 
> > Since kfree(NULL) is fine, how about just removing the if? Also, this
> > code has been removed in a recent change in the wireless tree, I think
> > (the rate control revamp)
> > 
> 
> Rate control hasn't been revamped yet. :)

Well, Felix's and my patch touched this code but did actually leave the
indentation strange like that. Anyway, since it will be rewritten
eventually and the strange indentation doesn't hurt right now, I think
not touching it will be simpler to avoid merge conflicts all around.

johannes

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH 09/10] b43legacy: reindent misleading statement

[Larry Finger]

Ilpo J=E4rvinen wrote:
> Signed-off-by: Ilpo J=E4rvinen <ilpo.jarvinen@helsinki.fi>
> ---
>  drivers/net/wireless/b43legacy/dma.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>=20

ACK.

Larry


--
To unsubscribe from this list: send the line "unsubscribe linux-wireles=
s" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html