* [PATCH 7/11] drivers/net/wireless/ath9k: Move a dereference below a NULL test
@ 2008-12-16 15:14 Julia Lawall
2008-12-18 15:50 ` John W. Linville
0 siblings, 1 reply; 4+ messages in thread
From: Julia Lawall @ 2008-12-16 15:14 UTC (permalink / raw)
To: lrodriguez, jmalinen, linux-wireless, ath9k-devel, linux-kernel,
kernel-janitors
From: Julia Lawall <julia@diku.dk>
In each case, if the NULL test is necessary, then the dereference should be
moved below the NULL test.
The semantic patch that makes this change is as follows:
(http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@@
type T;
expression E;
identifier i,fld;
statement S;
@@
- T i = E->fld;
+ T i;
... when != E
when != i
if (E == NULL) S
+ i = E->fld;
// </smpl>
Signed-off-by: Julia Lawall <julia@diku.dk>
---
drivers/net/wireless/ath9k/hw.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/drivers/net/wireless/ath9k/hw.c b/drivers/net/wireless/ath9k/hw.c
index 98bc25c..7d1dac6 100644
--- a/drivers/net/wireless/ath9k/hw.c
+++ b/drivers/net/wireless/ath9k/hw.c
@@ -5581,11 +5581,12 @@ static inline bool ath9k_hw_run_init_cals(struct ath_hal *ah,
struct ath9k_channel ichan;
bool isCalDone;
struct hal_cal_list *currCal = ahp->ah_cal_list_curr;
- const struct hal_percal_data *calData = currCal->calData;
+ const struct hal_percal_data *calData;
int i;
if (currCal == NULL)
return false;
+ calData = currCal->calData;
ichan.CalValid = 0;
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH 7/11] drivers/net/wireless/ath9k: Move a dereference below a NULL test
2008-12-16 15:14 [PATCH 7/11] drivers/net/wireless/ath9k: Move a dereference below a NULL test Julia Lawall
@ 2008-12-18 15:50 ` John W. Linville
2008-12-18 17:11 ` Julia Lawall
2008-12-18 17:18 ` Julia Lawall
0 siblings, 2 replies; 4+ messages in thread
From: John W. Linville @ 2008-12-18 15:50 UTC (permalink / raw)
To: Julia Lawall
Cc: lrodriguez, jmalinen, linux-wireless, ath9k-devel, linux-kernel,
kernel-janitors
On Tue, Dec 16, 2008 at 04:14:28PM +0100, Julia Lawall wrote:
> From: Julia Lawall <julia@diku.dk>
>
> In each case, if the NULL test is necessary, then the dereference should be
> moved below the NULL test.
>
> The semantic patch that makes this change is as follows:
> (http://www.emn.fr/x-info/coccinelle/)
>
> // <smpl>
> @@
> type T;
> expression E;
> identifier i,fld;
> statement S;
> @@
>
> - T i = E->fld;
> + T i;
> ... when != E
> when != i
> if (E == NULL) S
> + i = E->fld;
> // </smpl>
>
> Signed-off-by: Julia Lawall <julia@diku.dk>
>
> ---
> drivers/net/wireless/ath9k/hw.c | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/net/wireless/ath9k/hw.c b/drivers/net/wireless/ath9k/hw.c
> index 98bc25c..7d1dac6 100644
> --- a/drivers/net/wireless/ath9k/hw.c
> +++ b/drivers/net/wireless/ath9k/hw.c
> @@ -5581,11 +5581,12 @@ static inline bool ath9k_hw_run_init_cals(struct ath_hal *ah,
> struct ath9k_channel ichan;
> bool isCalDone;
> struct hal_cal_list *currCal = ahp->ah_cal_list_curr;
> - const struct hal_percal_data *calData = currCal->calData;
> + const struct hal_percal_data *calData;
> int i;
>
> if (currCal == NULL)
> return false;
> + calData = currCal->calData;
>
> ichan.CalValid = 0;
This patch doesn't seem to apply. I don't see this code anywhere.
Perhaps this is against some older version?
John
--
John W. Linville Linux should be at the core
linville@tuxdriver.com of your literate lifestyle.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 7/11] drivers/net/wireless/ath9k: Move a dereference below a NULL test
2008-12-18 15:50 ` John W. Linville
@ 2008-12-18 17:11 ` Julia Lawall
2008-12-18 17:18 ` Julia Lawall
1 sibling, 0 replies; 4+ messages in thread
From: Julia Lawall @ 2008-12-18 17:11 UTC (permalink / raw)
To: John W. Linville
Cc: lrodriguez, jmalinen, linux-wireless, ath9k-devel, linux-kernel,
kernel-janitors
On Thu, 18 Dec 2008, John W. Linville wrote:
> On Tue, Dec 16, 2008 at 04:14:28PM +0100, Julia Lawall wrote:
> > From: Julia Lawall <julia@diku.dk>
> >
> > In each case, if the NULL test is necessary, then the dereference should be
> > moved below the NULL test.
> >
> > The semantic patch that makes this change is as follows:
> > (http://www.emn.fr/x-info/coccinelle/)
> >
> > // <smpl>
> > @@
> > type T;
> > expression E;
> > identifier i,fld;
> > statement S;
> > @@
> >
> > - T i = E->fld;
> > + T i;
> > ... when != E
> > when != i
> > if (E == NULL) S
> > + i = E->fld;
> > // </smpl>
> >
> > Signed-off-by: Julia Lawall <julia@diku.dk>
> >
> > ---
> > drivers/net/wireless/ath9k/hw.c | 3 ++-
> > 1 files changed, 2 insertions(+), 1 deletions(-)
> >
> > diff --git a/drivers/net/wireless/ath9k/hw.c b/drivers/net/wireless/ath9k/hw.c
> > index 98bc25c..7d1dac6 100644
> > --- a/drivers/net/wireless/ath9k/hw.c
> > +++ b/drivers/net/wireless/ath9k/hw.c
> > @@ -5581,11 +5581,12 @@ static inline bool ath9k_hw_run_init_cals(struct ath_hal *ah,
> > struct ath9k_channel ichan;
> > bool isCalDone;
> > struct hal_cal_list *currCal = ahp->ah_cal_list_curr;
> > - const struct hal_percal_data *calData = currCal->calData;
> > + const struct hal_percal_data *calData;
> > int i;
> >
> > if (currCal == NULL)
> > return false;
> > + calData = currCal->calData;
> >
> > ichan.CalValid = 0;
>
> This patch doesn't seem to apply. I don't see this code anywhere.
> Perhaps this is against some older version?
I used the following version of linux-next, which indeed a bit out of
date:
commit feaf3848a813a106f163013af6fcf6c4bfec92d9
Merge: a771132... 0e435ac...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed Dec 3 16:45:56 2008 -0800
But I see the same code in the following version of linux-2.6
commit 1bda71282ded6a2e09a2db7c8884542fb46bfd4f
Merge: 7a62b17... 25a41b2...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue Dec 16 09:49:10 2008 -0800
julia
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 7/11] drivers/net/wireless/ath9k: Move a dereference below a NULL test
2008-12-18 15:50 ` John W. Linville
2008-12-18 17:11 ` Julia Lawall
@ 2008-12-18 17:18 ` Julia Lawall
1 sibling, 0 replies; 4+ messages in thread
From: Julia Lawall @ 2008-12-18 17:18 UTC (permalink / raw)
To: John W. Linville
Cc: lrodriguez, jmalinen, linux-wireless, ath9k-devel, linux-kernel,
kernel-janitors
Indeed the code seems to have complete changed.
julia
On Thu, 18 Dec 2008, John W. Linville wrote:
> On Tue, Dec 16, 2008 at 04:14:28PM +0100, Julia Lawall wrote:
> > From: Julia Lawall <julia@diku.dk>
> >
> > In each case, if the NULL test is necessary, then the dereference should be
> > moved below the NULL test.
> >
> > The semantic patch that makes this change is as follows:
> > (http://www.emn.fr/x-info/coccinelle/)
> >
> > // <smpl>
> > @@
> > type T;
> > expression E;
> > identifier i,fld;
> > statement S;
> > @@
> >
> > - T i = E->fld;
> > + T i;
> > ... when != E
> > when != i
> > if (E == NULL) S
> > + i = E->fld;
> > // </smpl>
> >
> > Signed-off-by: Julia Lawall <julia@diku.dk>
> >
> > ---
> > drivers/net/wireless/ath9k/hw.c | 3 ++-
> > 1 files changed, 2 insertions(+), 1 deletions(-)
> >
> > diff --git a/drivers/net/wireless/ath9k/hw.c b/drivers/net/wireless/ath9k/hw.c
> > index 98bc25c..7d1dac6 100644
> > --- a/drivers/net/wireless/ath9k/hw.c
> > +++ b/drivers/net/wireless/ath9k/hw.c
> > @@ -5581,11 +5581,12 @@ static inline bool ath9k_hw_run_init_cals(struct ath_hal *ah,
> > struct ath9k_channel ichan;
> > bool isCalDone;
> > struct hal_cal_list *currCal = ahp->ah_cal_list_curr;
> > - const struct hal_percal_data *calData = currCal->calData;
> > + const struct hal_percal_data *calData;
> > int i;
> >
> > if (currCal == NULL)
> > return false;
> > + calData = currCal->calData;
> >
> > ichan.CalValid = 0;
>
> This patch doesn't seem to apply. I don't see this code anywhere.
> Perhaps this is against some older version?
>
> John
> --
> John W. Linville Linux should be at the core
> linville@tuxdriver.com of your literate lifestyle.
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2008-12-18 17:18 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-12-16 15:14 [PATCH 7/11] drivers/net/wireless/ath9k: Move a dereference below a NULL test Julia Lawall
2008-12-18 15:50 ` John W. Linville
2008-12-18 17:11 ` Julia Lawall
2008-12-18 17:18 ` Julia Lawall
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox