remove trailing whitespaces

[dpdk.git] / lib / librte_eal / bsdapp / eal / eal.c

diff --git a/lib/librte_eal/bsdapp/eal/eal.c b/lib/librte_eal/bsdapp/eal/eal.c
index 3b2b47f..a1f014f 100644 (file)
--- a/lib/librte_eal/bsdapp/eal/eal.c
+++ b/lib/librte_eal/bsdapp/eal/eal.c
@@ -1,14 +1,14 @@
 /*-
  *   BSD LICENSE
- * 
+ *
  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   Copyright(c) 2014 6WIND S.A.
  *   All rights reserved.
- * 
+ *
  *   Redistribution and use in source and binary forms, with or without
  *   modification, are permitted provided that the following conditions
  *   are met:
- * 
+ *
  *     * Redistributions of source code must retain the above copyright
  *       notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above copyright
@@ -18,7 +18,7 @@
  *     * Neither the name of Intel Corporation nor the names of its
  *       contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -247,7 +247,7 @@ rte_eal_config_attach(void)
                        rte_panic("Cannot open '%s' for rte_mem_config\n", pathname);
        }
 
-       rte_mem_cfg_addr = mmap(NULL, sizeof(*rte_config.mem_config), 
+       rte_mem_cfg_addr = mmap(NULL, sizeof(*rte_config.mem_config),
                                PROT_READ | PROT_WRITE, MAP_SHARED, mem_cfg_fd, 0);
        close(mem_cfg_fd);
        if (rte_mem_cfg_addr == MAP_FAILED)
@@ -280,8 +280,6 @@ eal_proc_type_detect(void)
 static void
 rte_config_init(void)
 {
-       /* set the magic in configuration structure */
-       rte_config.magic = RTE_MAGIC;
        rte_config.process_type = (internal_config.process_type == RTE_PROC_AUTO) ?
                        eal_proc_type_detect() : /* for auto, detect the type */
                        internal_config.process_type; /* otherwise use what's already set */
@@ -309,8 +307,7 @@ eal_usage(const char *prgname)
               "EAL options:\n"
               "  -c COREMASK  : A hexadecimal bitmask of cores to run on\n"
               "  -n NUM       : Number of memory channels\n"
-                  "  -v           : Display version information on startup\n"
-              "                 (multiple -b options are allowed)\n"
+              "  -v           : Display version information on startup\n"
               "  -m MB        : memory to allocate\n"
               "  -r NUM       : force number of memory ranks (don't detect)\n"
               "  --"OPT_PROC_TYPE"  : type of this process\n"
@@ -325,8 +322,7 @@ eal_usage(const char *prgname)
               "  --"OPT_VDEV": add a virtual device.\n"
               "               The argument format is <driver><id>[,key=val,...]\n"
               "               (ex: --vdev=eth_pcap0,iface=eth2).\n"
-              "  --"OPT_VMWARE_TSC_MAP": use VMware TSC map instead of "
-                          "native RDTSC\n"
+              "  --"OPT_VMWARE_TSC_MAP": use VMware TSC map instead of native RDTSC\n"
               "\nEAL options for DEBUG use only:\n"
               "  --"OPT_NO_HUGE"  : use malloc instead of hugetlbfs\n"
               "  --"OPT_NO_PCI"   : disable pci\n"
@@ -361,11 +357,11 @@ rte_set_application_usage_hook( rte_usage_hook_t usage_func )
 static int xdigit2val(unsigned char c)
 {
        int val;
-       if(isdigit(c)) 
+       if(isdigit(c))
                val = c - '0';
        else if(isupper(c))
                val = c - 'A' + 10;
-       else 
+       else
                val = c - 'a' + 10;
        return val;
 }
@@ -769,7 +765,7 @@ sync_func(__attribute__((unused)) void *arg)
        return 0;
 }
 
-inline static void 
+inline static void
 rte_eal_mcfg_complete(void)
 {
        /* ALL shared mem_config related INIT DONE */
@@ -783,7 +779,7 @@ int rte_eal_has_hugepages(void)
        return !internal_config.no_hugetlbfs;
 }
 
-/* Abstraction for port I/0 privilage */
+/* Abstraction for port I/0 privilege */
 static int
 rte_eal_iopl_init(void)
 {
@@ -878,8 +874,8 @@ rte_eal_init(int argc, char **argv)
 
        rte_eal_mcfg_complete();
 
-       if (rte_eal_vdev_init() < 0)
-               rte_panic("Cannot init virtual devices\n");
+       if (rte_eal_dev_init() < 0)
+               rte_panic("Cannot init pmd devices\n");
 
        RTE_LCORE_FOREACH_SLAVE(i) {