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

Subsystems: atheros ath generic utilities, atheros ath5k wireless driver, the rest

STALE4075d

5 messages, 3 authors, 2015-06-11 · open the first message on its own page

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

From: Fabian Frederick <hidden>
Date: 2015-06-10 16:34:56

Use kernel.h macro definition.

Thanks to Julia Lawall for Coccinelle scripting support.

Signed-off-by: Fabian Frederick <redacted>
---
 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

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

From: Joe Perches <joe@perches.com>
Date: 2015-06-10 19:53:01

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.
[]
quoted hunk
diff --git a/drivers/net/wireless/ath/ath5k/phy.c b/drivers/net/wireless/ath/ath5k/phy.c
[]
quoted hunk
@@ -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.

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

From: Fabian Frederick <hidden>
Date: 2015-06-10 19:59:50

On 10 June 2015 at 21:52 Joe Perches [off-list ref] wrote:


On Wed, 2015-06-10 at 18:33 +0200, Fabian Frederick wrote:
quoted
Use kernel.h macro definition.

Thanks to Julia Lawall for Coccinelle scripting support.
[]
quoted
diff --git a/drivers/net/wireless/ath/ath5k/phy.c
b/drivers/net/wireless/ath/ath5k/phy.c
[]
quoted
@@ -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 linux-wireless" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

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

From: Julia Lawall <hidden>
Date: 2015-06-10 20:29:30


On Wed, 10 Jun 2015, Fabian Frederick wrote:
quoted
On 10 June 2015 at 21:52 Joe Perches [off-list ref] wrote:


On Wed, 2015-06-10 at 18:33 +0200, Fabian Frederick wrote:
quoted
Use kernel.h macro definition.

Thanks to Julia Lawall for Coccinelle scripting support.
[]
quoted
diff --git a/drivers/net/wireless/ath/ath5k/phy.c
b/drivers/net/wireless/ath/ath5k/phy.c
[]
quoted
@@ -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
quoted

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

From: Fabian Frederick <hidden>
Date: 2015-06-11 05:06:42

On 10 June 2015 at 22:29 Julia Lawall [off-list ref] wrote:




On Wed, 10 Jun 2015, Fabian Frederick wrote:
quoted
quoted
On 10 June 2015 at 21:52 Joe Perches [off-list ref] wrote:


On Wed, 2015-06-10 at 18:33 +0200, Fabian Frederick wrote:
quoted
Use kernel.h macro definition.

Thanks to Julia Lawall for Coccinelle scripting support.
[]
quoted
diff --git a/drivers/net/wireless/ath/ath5k/phy.c
b/drivers/net/wireless/ath/ath5k/phy.c
[]
quoted
@@ -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
quoted
Regards,
Fabian
quoted
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help