diff options
| author | Fabian Frederick <fabf@skynet.be> | 2015-06-10 18:33:16 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-06-11 15:19:41 -0700 |
| commit | c9003ec8c5c2ae0481681340dff2346b144043b8 (patch) | |
| tree | c8139ac321eaead0dda6a202439ba8e422b072dd | |
| parent | e55898a7ed3c1fb3ebf866e84c93f35e2bed7d5d (diff) | |
| download | linux-c9003ec8c5c2ae0481681340dff2346b144043b8.tar.bz2 | |
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>
| -rw-r--r-- | drivers/net/ethernet/ibm/emac/core.c | 10 |
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]); } } } |