| Message ID | 1433954015-24872-1-git-send-email-fabf@skynet.be |
|---|---|
| State | Awaiting Upstream, archived |
| Delegated to: | David Miller |
| Headers | show |
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. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
> On 10 June 2015 at 21:52 Joe Perches <joe@perches.com> 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 > > -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, 10 Jun 2015, Fabian Frederick wrote: > > > > On 10 June 2015 at 21:52 Joe Perches <joe@perches.com> 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 > > > > >
> On 10 June 2015 at 22:29 Julia Lawall <julia.lawall@lip6.fr> wrote: > > > > > On Wed, 10 Jun 2015, Fabian Frederick wrote: > > > > > > > > On 10 June 2015 at 21:52 Joe Perches <joe@perches.com> 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 > > > > > > > > -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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++) {
Use kernel.h macro definition. Thanks to Julia Lawall for Coccinelle scripting support. Signed-off-by: Fabian Frederick <fabf@skynet.be> --- drivers/net/wireless/ath/ath5k/phy.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)