2015-06-10 16:34:56

by Fabian Frédérick

Subject: [PATCH 1/1 linux-next] ath5k: use swap() in ath5k_hw_get_median_noise_floor()

Use kernel.h macro definition.

Thanks to Julia Lawall for Coccinelle scripting support.

Signed-off-by: Fabian Frederick <[email protected]>
---
drivers/net/wireless/ath/ath5k/phy.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/drivers/net/wireless/ath/ath5k/phy.c b/drivers/net/wireless/ath/ath5k/phy.c
index 0fce1c7..ef108a3 100644
--- a/drivers/net/wireless/ath/ath5k/phy.c
+++ b/drivers/net/wireless/ath/ath5k/phy.c
@@ -1566,17 +1566,13 @@ static s16
ath5k_hw_get_median_noise_floor(struct ath5k_hw *ah)
{
s16 sort[ATH5K_NF_CAL_HIST_MAX];
- s16 tmp;
int i, j;

memcpy(sort, ah->ah_nfcal_hist.nfval, sizeof(sort));
for (i = 0; i < ATH5K_NF_CAL_HIST_MAX - 1; i++) {
for (j = 1; j < ATH5K_NF_CAL_HIST_MAX - i; j++) {
- if (sort[j] > sort[j - 1]) {
- tmp = sort[j];
- sort[j] = sort[j - 1];
- sort[j - 1] = tmp;
- }
+ if (sort[j] > sort[j - 1])
+ swap(sort[j], sort[j]);
}
}
for (i = 0; i < ATH5K_NF_CAL_HIST_MAX; i++) {
--
2.4.2

2015-06-10 19:53:01

by Joe Perches

Subject: Re: [PATCH 1/1 linux-next] ath5k: use swap() in ath5k_hw_get_median_noise_floor()

On Wed, 2015-06-10 at 18:33 +0200, Fabian Frederick wrote:
> Use kernel.h macro definition.
>
> Thanks to Julia Lawall for Coccinelle scripting support.
[]
> diff --git a/drivers/net/wireless/ath/ath5k/phy.c b/drivers/net/wireless/ath/ath5k/phy.c
[]
> @@ -1566,17 +1566,13 @@ static s16
> ath5k_hw_get_median_noise_floor(struct ath5k_hw *ah)
> {
> s16 sort[ATH5K_NF_CAL_HIST_MAX];
> - s16 tmp;
> int i, j;
>
> memcpy(sort, ah->ah_nfcal_hist.nfval, sizeof(sort));
> for (i = 0; i < ATH5K_NF_CAL_HIST_MAX - 1; i++) {
> for (j = 1; j < ATH5K_NF_CAL_HIST_MAX - i; j++) {
> - if (sort[j] > sort[j - 1]) {
> - tmp = sort[j];
> - sort[j] = sort[j - 1];
> - sort[j - 1] = tmp;
> - }
> + if (sort[j] > sort[j - 1])
> + swap(sort[j], sort[j]);

swap(a, a) doesn't look useful.

2015-06-10 19:59:50

by Fabian Frédérick

Subject: Re: [PATCH 1/1 linux-next] ath5k: use swap() in ath5k_hw_get_median_noise_floor()

> On 10 June 2015 at 21:52 Joe Perches <[email protected]> wrote:
>
>
> On Wed, 2015-06-10 at 18:33 +0200, Fabian Frederick wrote:
> > Use kernel.h macro definition.
> >
> > Thanks to Julia Lawall for Coccinelle scripting support.
> []
> > diff --git a/drivers/net/wireless/ath/ath5k/phy.c
> > b/drivers/net/wireless/ath/ath5k/phy.c
> []
> > @@ -1566,17 +1566,13 @@ static s16
> >  ath5k_hw_get_median_noise_floor(struct ath5k_hw *ah)
> >  {
> >     s16 sort[ATH5K_NF_CAL_HIST_MAX];
> > -   s16 tmp;
> >     int i, j;
> > 
> >     memcpy(sort, ah->ah_nfcal_hist.nfval, sizeof(sort));
> >     for (i = 0; i < ATH5K_NF_CAL_HIST_MAX - 1; i++) {
> >             for (j = 1; j < ATH5K_NF_CAL_HIST_MAX - i; j++) {
> > -                   if (sort[j] > sort[j - 1]) {
> > -                           tmp = sort[j];
> > -                           sort[j] = sort[j - 1];
> > -                           sort[j - 1] = tmp;
> > -                   }
> > +                   if (sort[j] > sort[j - 1])
> > +                           swap(sort[j], sort[j]);
>
> swap(a, a) doesn't look useful.
Thanks a lot Joe, I'll fix this one :)

Regards,
Fabian
>
>

2015-06-10 20:29:30

by Julia Lawall

Subject: Re: [PATCH 1/1 linux-next] ath5k: use swap() in ath5k_hw_get_median_noise_floor()

On Wed, 10 Jun 2015, Fabian Frederick wrote:

>
>
> > On 10 June 2015 at 21:52 Joe Perches <[email protected]> wrote:
> >
> >
> > On Wed, 2015-06-10 at 18:33 +0200, Fabian Frederick wrote:
> > > Use kernel.h macro definition.
> > >
> > > Thanks to Julia Lawall for Coccinelle scripting support.
> > []
> > > diff --git a/drivers/net/wireless/ath/ath5k/phy.c
> > > b/drivers/net/wireless/ath/ath5k/phy.c
> > []
> > > @@ -1566,17 +1566,13 @@ static s16
> > >  ath5k_hw_get_median_noise_floor(struct ath5k_hw *ah)
> > >  {
> > >     s16 sort[ATH5K_NF_CAL_HIST_MAX];
> > > -   s16 tmp;
> > >     int i, j;
> > > 
> > >     memcpy(sort, ah->ah_nfcal_hist.nfval, sizeof(sort));
> > >     for (i = 0; i < ATH5K_NF_CAL_HIST_MAX - 1; i++) {
> > >             for (j = 1; j < ATH5K_NF_CAL_HIST_MAX - i; j++) {
> > > -                   if (sort[j] > sort[j - 1]) {
> > > -                           tmp = sort[j];
> > > -                           sort[j] = sort[j - 1];
> > > -                           sort[j - 1] = tmp;
> > > -                   }
> > > +                   if (sort[j] > sort[j - 1])
> > > +                           swap(sort[j], sort[j]);
> >
> > swap(a, a) doesn't look useful.
> Thanks a lot Joe, I'll fix this one :)

How did it come out like that?

julia

>
> Regards,
> Fabian
> >
> >
>

2015-06-11 05:06:42

by Fabian Frédérick

Subject: Re: [PATCH 1/1 linux-next] ath5k: use swap() in ath5k_hw_get_median_noise_floor()

> On 10 June 2015 at 22:29 Julia Lawall <[email protected]> wrote:
>
>
>
>
> On Wed, 10 Jun 2015, Fabian Frederick wrote:
>
> >
> >
> > > On 10 June 2015 at 21:52 Joe Perches <[email protected]> wrote:
> > >
> > >
> > > On Wed, 2015-06-10 at 18:33 +0200, Fabian Frederick wrote:
> > > > Use kernel.h macro definition.
> > > >
> > > > Thanks to Julia Lawall for Coccinelle scripting support.
> > > []
> > > > diff --git a/drivers/net/wireless/ath/ath5k/phy.c
> > > > b/drivers/net/wireless/ath/ath5k/phy.c
> > > []
> > > > @@ -1566,17 +1566,13 @@ static s16
> > > >  ath5k_hw_get_median_noise_floor(struct ath5k_hw *ah)
> > > >  {
> > > >     s16 sort[ATH5K_NF_CAL_HIST_MAX];
> > > > -   s16 tmp;
> > > >     int i, j;
> > > > 
> > > >     memcpy(sort, ah->ah_nfcal_hist.nfval, sizeof(sort));
> > > >     for (i = 0; i < ATH5K_NF_CAL_HIST_MAX - 1; i++) {
> > > >             for (j = 1; j < ATH5K_NF_CAL_HIST_MAX - i; j++) {
> > > > -                   if (sort[j] > sort[j - 1]) {
> > > > -                           tmp = sort[j];
> > > > -                           sort[j] = sort[j - 1];
> > > > -                           sort[j - 1] = tmp;
> > > > -                   }
> > > > +                   if (sort[j] > sort[j - 1])
> > > > +                           swap(sort[j], sort[j]);
> > >
> > > swap(a, a) doesn't look useful.
> > Thanks a lot Joe, I'll fix this one :)
>
> How did it come out like that?
>
> julia

I used script for detection only and made updates manually.
I guess I was distracted by [j - 1] on line above.
It was based on linux-next; if maintainers prefer another branch, I'll
send the right version on top of it.

Regards,
Fabian
>
> >
> > Regards,
> > Fabian
> > >
> > >
> >