net/ibm/emac: use swap() in emac_make_bootlist()

Use kernel.h macro definition.

Thanks to Julia Lawall for Coccinelle scripting support.

Signed-off-by: Fabian Frederick <fabf@skynet.be>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 3 insertions, 7 deletions

diff --git a/drivers/net/ethernet/ibm/emac/core.c b/drivers/net/ethernet/ibm/emac/core.c
index b9df0cbd0a38..b60a34d982a9 100644
--- a/drivers/net/ethernet/ibm/emac/core.c
+++ b/drivers/net/ethernet/ibm/emac/core.c
@@ -2999,7 +2999,7 @@ static struct platform_driver emac_driver = {
 static void __init emac_make_bootlist(void)
 {
         struct device_node *np = NULL;
-        int j, max, i = 0, k;
+        int j, max, i = 0;
         int cell_indices[EMAC_BOOT_LIST_SIZE];
 
         /* Collect EMACs */
@@ -3026,12 +3026,8 @@ static void __init emac_make_bootlist(void)
         for (i = 0; max > 1 && (i < (max - 1)); i++)
                 for (j = i; j < max; j++) {
                         if (cell_indices[i] > cell_indices[j]) {
-                                np = emac_boot_list[i];
-                                emac_boot_list[i] = emac_boot_list[j];
-                                emac_boot_list[j] = np;
-                                k = cell_indices[i];
-                                cell_indices[i] = cell_indices[j];
-                                cell_indices[j] = k;
+                                swap(emac_boot_list[i], emac_boot_list[j]);
+                                swap(cell_indices[i], cell_indices[j]);
                         }
                 }
 }