net/ring: fix coding style

Whitespace fixes to bring inline with current DPDK style.

Fixes: e1e4017751f1 ("ring: add new driver")
Fixes: a74a99bbb8ed ("ring: free rings when detaching device")
Fixes: 61934c0956d4 ("ring: convert to use of PMD_REGISTER_DRIVER and fix linking")
Cc: stable@dpdk.org
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>

diff --git a/drivers/net/ring/rte_eth_ring.c b/drivers/net/ring/rte_eth_ring.c
index 115a882..91e5f5f 100644 (file)
--- a/drivers/net/ring/rte_eth_ring.c
+++ b/drivers/net/ring/rte_eth_ring.c
@@ -45,8 +45,8 @@ struct ring_queue {
 };
 
 struct pmd_internals {
-       unsigned max_rx_queues;
-       unsigned max_tx_queues;
+       unsigned int max_rx_queues;
+       unsigned int max_tx_queues;
 
        struct ring_queue rx_ring_queues[RTE_PMD_RING_MAX_RX_RINGS];
        struct ring_queue tx_ring_queues[RTE_PMD_RING_MAX_TX_RINGS];
@@ -55,12 +55,11 @@ struct pmd_internals {
        enum dev_action action;
 };
 
-
 static struct rte_eth_link pmd_link = {
-               .link_speed = ETH_SPEED_NUM_10G,
-               .link_duplex = ETH_LINK_FULL_DUPLEX,
-               .link_status = ETH_LINK_DOWN,
-               .link_autoneg = ETH_LINK_FIXED,
+       .link_speed = ETH_SPEED_NUM_10G,
+       .link_duplex = ETH_LINK_FULL_DUPLEX,
+       .link_status = ETH_LINK_DOWN,
+       .link_autoneg = ETH_LINK_FIXED,
 };
 
 static int eth_ring_logtype;
@@ -138,6 +137,7 @@ eth_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id,
                                    struct rte_mempool *mb_pool __rte_unused)
 {
        struct pmd_internals *internals = dev->data->dev_private;
+
        dev->data->rx_queues[rx_queue_id] = &internals->rx_ring_queues[rx_queue_id];
        return 0;
 }
@@ -149,6 +149,7 @@ eth_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id,
                                    const struct rte_eth_txconf *tx_conf __rte_unused)
 {
        struct pmd_internals *internals = dev->data->dev_private;
+
        dev->data->tx_queues[tx_queue_id] = &internals->tx_ring_queues[tx_queue_id];
        return 0;
 }
@@ -156,9 +157,10 @@ eth_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id,
 
 static void
 eth_dev_info(struct rte_eth_dev *dev,
-               struct rte_eth_dev_info *dev_info)
+            struct rte_eth_dev_info *dev_info)
 {
        struct pmd_internals *internals = dev->data->dev_private;
+
        dev_info->max_mac_addrs = 1;
        dev_info->max_rx_pktlen = (uint32_t)-1;
        dev_info->max_rx_queues = (uint16_t)internals->max_rx_queues;
@@ -169,7 +171,7 @@ eth_dev_info(struct rte_eth_dev *dev,
 static int
 eth_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
 {
-       unsigned i;
+       unsigned int i;
        unsigned long rx_total = 0, tx_total = 0, tx_err_total = 0;
        const struct pmd_internals *internal = dev->data->dev_private;
 
@@ -197,8 +199,9 @@ eth_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
 static void
 eth_stats_reset(struct rte_eth_dev *dev)
 {
-       unsigned i;
+       unsigned int i;
        struct pmd_internals *internal = dev->data->dev_private;
+
        for (i = 0; i < dev->data->nb_rx_queues; i++)
                internal->rx_ring_queues[i].rx_pkts.cnt = 0;
        for (i = 0; i < dev->data->nb_tx_queues; i++) {
@@ -250,8 +253,10 @@ static struct rte_vdev_driver pmd_ring_drv;
 
 static int
 do_eth_dev_ring_create(const char *name,
-               struct rte_ring * const rx_queues[], const unsigned nb_rx_queues,
-               struct rte_ring *const tx_queues[], const unsigned nb_tx_queues,
+               struct rte_ring * const rx_queues[],
+               const unsigned int nb_rx_queues,
+               struct rte_ring *const tx_queues[],
+               const unsigned int nb_tx_queues,
                const unsigned int numa_node, enum dev_action action,
                struct rte_eth_dev **eth_dev_p)
 {
@@ -260,7 +265,7 @@ do_eth_dev_ring_create(const char *name,
        struct rte_eth_dev *eth_dev = NULL;
        void **rx_queues_local = NULL;
        void **tx_queues_local = NULL;
-       unsigned i;
+       unsigned int i;
 
        PMD_LOG(INFO, "Creating rings-backed ethdev on numa socket %u",
                        numa_node);
@@ -344,10 +349,10 @@ error:
 
 int
 rte_eth_from_rings(const char *name, struct rte_ring *const rx_queues[],
-               const unsigned nb_rx_queues,
+               const unsigned int nb_rx_queues,
                struct rte_ring *const tx_queues[],
-               const unsigned nb_tx_queues,
-               const unsigned numa_node)
+               const unsigned int nb_tx_queues,
+               const unsigned int numa_node)
 {
        struct ring_internal_args args = {
                .rx_queues = rx_queues,
@@ -398,16 +403,16 @@ rte_eth_from_ring(struct rte_ring *r)
 }
 
 static int
-eth_dev_ring_create(const char *name, const unsigned numa_node,
+eth_dev_ring_create(const char *name, const unsigned int numa_node,
                enum dev_action action, struct rte_eth_dev **eth_dev)
 {
        /* rx and tx are so-called from point of view of first port.
         * They are inverted from the point of view of second port
         */
        struct rte_ring *rxtx[RTE_PMD_RING_MAX_RX_RINGS];
-       unsigned i;
+       unsigned int i;
        char rng_name[RTE_RING_NAMESIZE];
-       unsigned num_rings = RTE_MIN(RTE_PMD_RING_MAX_RX_RINGS,
+       unsigned int num_rings = RTE_MIN(RTE_PMD_RING_MAX_RX_RINGS,
                        RTE_PMD_RING_MAX_TX_RINGS);
 
        for (i = 0; i < num_rings; i++) {
@@ -429,17 +434,18 @@ eth_dev_ring_create(const char *name, const unsigned numa_node,
 
 struct node_action_pair {
        char name[PATH_MAX];
-       unsigned node;
+       unsigned int node;
        enum dev_action action;
 };
 
 struct node_action_list {
-       unsigned total;
-       unsigned count;
+       unsigned int total;
+       unsigned int count;
        struct node_action_pair *list;
 };
 
-static int parse_kvlist (const char *key __rte_unused, const char *value, void *data)
+static int parse_kvlist(const char *key __rte_unused,
+                       const char *value, void *data)
 {
        struct node_action_list *info = data;
        int ret;
@@ -553,8 +559,8 @@ rte_pmd_ring_probe(struct rte_vdev_device *dev)
                kvlist = rte_kvargs_parse(params, valid_arguments);
 
                if (!kvlist) {
-                       PMD_LOG(INFO, "Ignoring unsupported parameters when creating"
-                                       " rings-backed ethernet device");
+                       PMD_LOG(INFO,
+                               "Ignoring unsupported parameters when creatingrings-backed ethernet device");
                        ret = eth_dev_ring_create(name, rte_socket_id(),
                                                  DEV_CREATE, &eth_dev);
                        if (ret == -1) {
@@ -598,7 +604,7 @@ rte_pmd_ring_probe(struct rte_vdev_device *dev)
                                goto out_free;
 
                        info->total = ret;
-                       info->list = (struct node_action_pair*)(info + 1);
+                       info->list = (struct node_action_pair *)(info + 1);
 
                        ret = rte_kvargs_process(kvlist, ETH_RING_NUMA_NODE_ACTION_ARG,
                                                 parse_kvlist, info);