net/mlx5: fix probe return value polarity
authorShahaf Shuler <shahafs@mellanox.com>
Thu, 3 May 2018 07:59:37 +0000 (10:59 +0300)
committerFerruh Yigit <ferruh.yigit@intel.com>
Mon, 14 May 2018 21:31:48 +0000 (22:31 +0100)
mlx5 prefixed function returns a negative errno value.
the error handler on mlx5_pci_probe is doing the same.

Fixes: a6d83b6a9209 ("net/mlx5: standardize on negative errno values")

Signed-off-by: Shahaf Shuler <shahafs@mellanox.com>
Acked-by: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>
drivers/net/mlx5/mlx5.c

index 46cb370..5190b9f 100644 (file)
@@ -751,8 +751,9 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
        DRV_LOG(WARNING,
                "tunnel offloading disabled due to old OFED/rdma-core version");
 #endif
-       if (mlx5_glue->query_device_ex(attr_ctx, NULL, &device_attr)) {
-               err = errno;
+       err = mlx5_glue->query_device_ex(attr_ctx, NULL, &device_attr);
+       if (err) {
+               DEBUG("ibv_query_device_ex() failed");
                goto error;
        }
        DRV_LOG(INFO, "%u port(s) detected",
@@ -800,16 +801,22 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
                        eth_dev->device = &pci_dev->device;
                        eth_dev->dev_ops = &mlx5_dev_sec_ops;
                        err = mlx5_uar_init_secondary(eth_dev);
-                       if (err)
+                       if (err) {
+                               err = rte_errno;
                                goto error;
+                       }
                        /* Receive command fd from primary process */
                        err = mlx5_socket_connect(eth_dev);
-                       if (err < 0)
+                       if (err < 0) {
+                               err = rte_errno;
                                goto error;
+                       }
                        /* Remap UAR for Tx queues. */
                        err = mlx5_tx_uar_remap(eth_dev, err);
-                       if (err)
+                       if (err) {
+                               err = rte_errno;
                                goto error;
+                       }
                        /*
                         * Ethdev pointer is still required as input since
                         * the primary device is not accessible from the
@@ -873,11 +880,12 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
                if (err) {
                        DRV_LOG(ERR, "failed to process device arguments: %s",
                                strerror(err));
+                       err = rte_errno;
                        goto port_error;
                }
-               if (mlx5_glue->query_device_ex(ctx, NULL, &device_attr_ex)) {
+               err = mlx5_glue->query_device_ex(ctx, NULL, &device_attr_ex);
+               if (err) {
                        DRV_LOG(ERR, "ibv_query_device_ex() failed");
-                       err = errno;
                        goto port_error;
                }
                config.hw_csum = !!(device_attr_ex.device_cap_flags_ex &
@@ -952,8 +960,10 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
                rte_eth_copy_pci_info(eth_dev, pci_dev);
                eth_dev->device->driver = &mlx5_driver.driver;
                err = mlx5_uar_init_primary(eth_dev);
-               if (err)
+               if (err) {
+                       err = rte_errno;
                        goto port_error;
+               }
                /* Configure the first MAC address by default. */
                if (mlx5_get_mac(eth_dev, &mac.addr_bytes)) {
                        DRV_LOG(ERR,
@@ -983,8 +993,10 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
 #endif
                /* Get actual MTU if possible. */
                err = mlx5_get_mtu(eth_dev, &priv->mtu);
-               if (err)
+               if (err) {
+                       err = rte_errno;
                        goto port_error;
+               }
                DRV_LOG(DEBUG, "port %u MTU is %u", eth_dev->data->port_id,
                        priv->mtu);
                /*
@@ -1031,6 +1043,7 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
                if (err) {
                        DRV_LOG(ERR, "port %u drop queue allocation failed: %s",
                                eth_dev->data->port_id, strerror(rte_errno));
+                       err = rte_errno;
                        goto port_error;
                }
                /* Supported Verbs flow priority number detection. */