These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / net / ethernet / ibm / emac / core.c

diff --git a/kernel/drivers/net/ethernet/ibm/emac/core.c b/kernel/drivers/net/ethernet/ibm/emac/core.c
index b9df0cb..5d7db6c 100644 (file)
--- a/kernel/drivers/net/ethernet/ibm/emac/core.c
+++ b/kernel/drivers/net/ethernet/ibm/emac/core.c
@@ -2204,7 +2204,6 @@ static void emac_ethtool_get_drvinfo(struct net_device *ndev,
        strlcpy(info->version, DRV_VERSION, sizeof(info->version));
        snprintf(info->bus_info, sizeof(info->bus_info), "PPC 4xx EMAC-%d %s",
                 dev->cell_index, dev->ofdev->dev.of_node->full_name);
-       info->regdump_len = emac_ethtool_get_regs_len(ndev);
 }
 
 static const struct ethtool_ops emac_ethtool_ops = {
@@ -2999,7 +2998,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 +3025,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]);
                        }
                }
 }