[PATCH 0/5] Driver register fixes

[PATCH 0/5] Driver register fixes

[Pablo de Lara]

This patchset makes some extra changes after the modification
of the PMD_REGISTER_DRIVER macro, including renaming back
some virtual device driver names (virtio could not be renamed)
and fixing/adding arguments of some drivers. 

Pablo de Lara (5):
  drivers: revert vdev driver names to original
  drivers: remove static driver names
  drivers: split driver arguments in multiple lines
  drivers: add missing virtio and xenvirt arguments
  net/bonding: fix range of mode argument

 drivers/crypto/aesni_gcm/aesni_gcm_pmd.c   |  6 ++++--
 drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c |  6 ++++--
 drivers/crypto/kasumi/rte_kasumi_pmd.c     |  6 ++++--
 drivers/crypto/null/null_crypto_pmd.c      |  6 ++++--
 drivers/crypto/snow3g/rte_snow3g_pmd.c     |  6 ++++--
 drivers/net/af_packet/rte_eth_af_packet.c  |  9 ++++++---
 drivers/net/bnxt/bnxt_ethdev.c             |  1 -
 drivers/net/bonding/rte_eth_bond_pmd.c     | 19 ++++++++++++-------
 drivers/net/cxgbe/cxgbe_ethdev.c           |  1 -
 drivers/net/ena/ena_ethdev.c               |  1 -
 drivers/net/mlx4/mlx4.c                    |  1 -
 drivers/net/mlx5/mlx5.c                    |  1 -
 drivers/net/mpipe/mpipe_tilegx.c           |  6 ++----
 drivers/net/null/rte_eth_null.c            |  5 +++--
 drivers/net/pcap/rte_eth_pcap.c            | 11 +++++++----
 drivers/net/ring/rte_eth_ring.c            |  4 ++--
 drivers/net/szedata2/rte_eth_szedata2.c    |  7 +++----
 drivers/net/thunderx/nicvf_ethdev.c        |  1 -
 drivers/net/vhost/rte_eth_vhost.c          |  5 +++--
 drivers/net/virtio/virtio_user_ethdev.c    |  7 ++++++-
 drivers/net/xenvirt/rte_eth_xenvirt.c      |  5 +++--
 21 files changed, 67 insertions(+), 47 deletions(-)

-- 
2.7.4

[PATCH 1/5] drivers: revert vdev driver names to original

[Pablo de Lara]

In order to avoid API breakage, the driver names of the virtual devices
have been renamed to their original name, before the modification
of the PMD_REGISTER_DRIVER macro, which sets now the driver names.

Fixes: cb6696d22023 ("drivers: update registration macro usage")

Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
---
 drivers/net/bonding/rte_eth_bond_pmd.c | 4 ++--
 drivers/net/mpipe/mpipe_tilegx.c       | 4 ++--
 drivers/net/pcap/rte_eth_pcap.c        | 4 ++--
 drivers/net/xenvirt/rte_eth_xenvirt.c  | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c
index e2890be..c373746 100644
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -2515,9 +2515,9 @@ static struct rte_driver bond_drv = {
 	.uninit = bond_uninit,
 };
 
-PMD_REGISTER_DRIVER(bond_drv, bonding);
+PMD_REGISTER_DRIVER(bond_drv, eth_bond);
 
-DRIVER_REGISTER_PARAM_STRING(bonding, "slave=<ifc> primary=<ifc> mode=[0-4] "
+DRIVER_REGISTER_PARAM_STRING(eth_bond, "slave=<ifc> primary=<ifc> mode=[0-4] "
 "xmit_policy=[l2 | l23 | l34] socket_id=<int> mac=<mac addr> "
 "lsc_poll_period_ms=<int> up_delay=<int> down_delay=<int>");
 
diff --git a/drivers/net/mpipe/mpipe_tilegx.c b/drivers/net/mpipe/mpipe_tilegx.c
index 4a2a905..64f4251 100644
--- a/drivers/net/mpipe/mpipe_tilegx.c
+++ b/drivers/net/mpipe/mpipe_tilegx.c
@@ -1635,8 +1635,8 @@ static struct rte_driver pmd_mpipe_gbe_drv = {
 	.init = rte_pmd_mpipe_devinit,
 };
 
-PMD_REGISTER_DRIVER(pmd_mpipe_xgbe_drv, mpipe_xgbe);
-PMD_REGISTER_DRIVER(pmd_mpipe_gbe_drv, mpipe_gbe);
+PMD_REGISTER_DRIVER(pmd_mpipe_xgbe_drv, xgbe);
+PMD_REGISTER_DRIVER(pmd_mpipe_gbe_drv, gbe);
 
 static void __attribute__((constructor, used))
 mpipe_init_contexts(void)
diff --git a/drivers/net/pcap/rte_eth_pcap.c b/drivers/net/pcap/rte_eth_pcap.c
index b341f93..7125823 100644
--- a/drivers/net/pcap/rte_eth_pcap.c
+++ b/drivers/net/pcap/rte_eth_pcap.c
@@ -1090,6 +1090,6 @@ static struct rte_driver pmd_pcap_drv = {
 	.uninit = rte_pmd_pcap_devuninit,
 };
 
-PMD_REGISTER_DRIVER(pmd_pcap_drv, pcap);
-DRIVER_REGISTER_PARAM_STRING(pcap, "rx_pcap=<string> tx_pcap=<string> "
+PMD_REGISTER_DRIVER(pmd_pcap_drv, eth_pcap);
+DRIVER_REGISTER_PARAM_STRING(eth_pcap, "rx_pcap=<string> tx_pcap=<string> "
 "rx_iface=<ifc> tx_iface=<ifc> iface=<ifc>");
diff --git a/drivers/net/xenvirt/rte_eth_xenvirt.c b/drivers/net/xenvirt/rte_eth_xenvirt.c
index 47e3299..5122559 100644
--- a/drivers/net/xenvirt/rte_eth_xenvirt.c
+++ b/drivers/net/xenvirt/rte_eth_xenvirt.c
@@ -766,4 +766,4 @@ static struct rte_driver pmd_xenvirt_drv = {
 	.uninit = rte_pmd_xenvirt_devuninit,
 };
 
-PMD_REGISTER_DRIVER(pmd_xenvirt_drv, xenvirt);
+PMD_REGISTER_DRIVER(pmd_xenvirt_drv, eth_xenvirt);
-- 
2.7.4

[PATCH 2/5] drivers: remove static driver names

[Pablo de Lara]

Since now the PMD_REGISTER_DRIVER macro sets the driver names,
there is no need to have the rte_driver structure setting it
statically, as it will get overridden.

Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
---
 drivers/net/af_packet/rte_eth_af_packet.c | 1 -
 drivers/net/bnxt/bnxt_ethdev.c            | 1 -
 drivers/net/bonding/rte_eth_bond_pmd.c    | 1 -
 drivers/net/cxgbe/cxgbe_ethdev.c          | 1 -
 drivers/net/ena/ena_ethdev.c              | 1 -
 drivers/net/mlx4/mlx4.c                   | 1 -
 drivers/net/mlx5/mlx5.c                   | 1 -
 drivers/net/mpipe/mpipe_tilegx.c          | 2 --
 drivers/net/null/rte_eth_null.c           | 1 -
 drivers/net/pcap/rte_eth_pcap.c           | 1 -
 drivers/net/ring/rte_eth_ring.c           | 1 -
 drivers/net/szedata2/rte_eth_szedata2.c   | 7 +++----
 drivers/net/thunderx/nicvf_ethdev.c       | 1 -
 drivers/net/vhost/rte_eth_vhost.c         | 1 -
 drivers/net/virtio/virtio_user_ethdev.c   | 1 -
 drivers/net/xenvirt/rte_eth_xenvirt.c     | 1 -
 16 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/drivers/net/af_packet/rte_eth_af_packet.c b/drivers/net/af_packet/rte_eth_af_packet.c
index 1d48e97..238eed8 100644
--- a/drivers/net/af_packet/rte_eth_af_packet.c
+++ b/drivers/net/af_packet/rte_eth_af_packet.c
@@ -890,7 +890,6 @@ rte_pmd_af_packet_devuninit(const char *name)
 }
 
 static struct rte_driver pmd_af_packet_drv = {
-	.name = "eth_af_packet",
 	.type = PMD_VDEV,
 	.init = rte_pmd_af_packet_devinit,
 	.uninit = rte_pmd_af_packet_devuninit,
diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index 9531abf..9a2123e 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -1041,7 +1041,6 @@ static int bnxt_rte_pmd_init(const char *name, const char *params __rte_unused)
 }
 
 static struct rte_driver bnxt_pmd_drv = {
-	.name = "eth_bnxt",
 	.type = PMD_PDEV,
 	.init = bnxt_rte_pmd_init,
 };
diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c
index c373746..0361be3 100644
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -2509,7 +2509,6 @@ bond_ethdev_configure(struct rte_eth_dev *dev)
 }
 
 static struct rte_driver bond_drv = {
-	.name = "eth_bond",
 	.type = PMD_VDEV,
 	.init = bond_init,
 	.uninit = bond_uninit,
diff --git a/drivers/net/cxgbe/cxgbe_ethdev.c b/drivers/net/cxgbe/cxgbe_ethdev.c
index 69ff813..9208a61 100644
--- a/drivers/net/cxgbe/cxgbe_ethdev.c
+++ b/drivers/net/cxgbe/cxgbe_ethdev.c
@@ -1062,7 +1062,6 @@ static int rte_cxgbe_pmd_init(const char *name __rte_unused,
 }
 
 static struct rte_driver rte_cxgbe_driver = {
-	.name = "cxgbe_driver",
 	.type = PMD_PDEV,
 	.init = rte_cxgbe_pmd_init,
 };
diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c
index 702289b..11c7218 100644
--- a/drivers/net/ena/ena_ethdev.c
+++ b/drivers/net/ena/ena_ethdev.c
@@ -1445,7 +1445,6 @@ rte_ena_pmd_init(const char *name __rte_unused,
 };
 
 struct rte_driver ena_pmd_drv = {
-	.name = "ena_driver",
 	.type = PMD_PDEV,
 	.init = rte_ena_pmd_init,
 };
diff --git a/drivers/net/mlx4/mlx4.c b/drivers/net/mlx4/mlx4.c
index d9ffb13..8e1f7cb 100644
--- a/drivers/net/mlx4/mlx4.c
+++ b/drivers/net/mlx4/mlx4.c
@@ -5857,7 +5857,6 @@ rte_mlx4_pmd_init(const char *name, const char *args)
 
 static struct rte_driver rte_mlx4_driver = {
 	.type = PMD_PDEV,
-	.name = MLX4_DRIVER_NAME,
 	.init = rte_mlx4_pmd_init,
 };
 
diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index 8d32252..d96a9af 100644
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -758,7 +758,6 @@ rte_mlx5_pmd_init(const char *name, const char *args)
 
 static struct rte_driver rte_mlx5_driver = {
 	.type = PMD_PDEV,
-	.name = MLX5_DRIVER_NAME,
 	.init = rte_mlx5_pmd_init,
 };
 
diff --git a/drivers/net/mpipe/mpipe_tilegx.c b/drivers/net/mpipe/mpipe_tilegx.c
index 64f4251..93f8730 100644
--- a/drivers/net/mpipe/mpipe_tilegx.c
+++ b/drivers/net/mpipe/mpipe_tilegx.c
@@ -1624,13 +1624,11 @@ rte_pmd_mpipe_devinit(const char *ifname,
 }
 
 static struct rte_driver pmd_mpipe_xgbe_drv = {
-	.name = "xgbe",
 	.type = PMD_VDEV,
 	.init = rte_pmd_mpipe_devinit,
 };
 
 static struct rte_driver pmd_mpipe_gbe_drv = {
-	.name = "gbe",
 	.type = PMD_VDEV,
 	.init = rte_pmd_mpipe_devinit,
 };
diff --git a/drivers/net/null/rte_eth_null.c b/drivers/net/null/rte_eth_null.c
index ae0ff77..367b884 100644
--- a/drivers/net/null/rte_eth_null.c
+++ b/drivers/net/null/rte_eth_null.c
@@ -687,7 +687,6 @@ rte_pmd_null_devuninit(const char *name)
 }
 
 static struct rte_driver pmd_null_drv = {
-	.name = "eth_null",
 	.type = PMD_VDEV,
 	.init = rte_pmd_null_devinit,
 	.uninit = rte_pmd_null_devuninit,
diff --git a/drivers/net/pcap/rte_eth_pcap.c b/drivers/net/pcap/rte_eth_pcap.c
index 7125823..1bcd7e5 100644
--- a/drivers/net/pcap/rte_eth_pcap.c
+++ b/drivers/net/pcap/rte_eth_pcap.c
@@ -1084,7 +1084,6 @@ rte_pmd_pcap_devuninit(const char *name)
 }
 
 static struct rte_driver pmd_pcap_drv = {
-	.name = "eth_pcap",
 	.type = PMD_VDEV,
 	.init = rte_pmd_pcap_devinit,
 	.uninit = rte_pmd_pcap_devuninit,
diff --git a/drivers/net/ring/rte_eth_ring.c b/drivers/net/ring/rte_eth_ring.c
index f2f5217..dee5038 100644
--- a/drivers/net/ring/rte_eth_ring.c
+++ b/drivers/net/ring/rte_eth_ring.c
@@ -624,7 +624,6 @@ rte_pmd_ring_devuninit(const char *name)
 }
 
 static struct rte_driver pmd_ring_drv = {
-	.name = "eth_ring",
 	.type = PMD_VDEV,
 	.init = rte_pmd_ring_devinit,
 	.uninit = rte_pmd_ring_devuninit,
diff --git a/drivers/net/szedata2/rte_eth_szedata2.c b/drivers/net/szedata2/rte_eth_szedata2.c
index e71bce5..483d789 100644
--- a/drivers/net/szedata2/rte_eth_szedata2.c
+++ b/drivers/net/szedata2/rte_eth_szedata2.c
@@ -62,7 +62,7 @@
  */
 #define RTE_SZE2_PACKET_HEADER_SIZE_ALIGNED 8
 
-#define RTE_SZEDATA2_DRIVER_NAME "rte_szedata2_pmd"
+#define RTE_SZEDATA2_DRIVER_NAME rte_szedata2_pmd
 #define RTE_SZEDATA2_PCI_DRIVER_NAME "rte_szedata2_pmd"
 
 #define SZEDATA2_DEV_PATH_FMT "/dev/szedataII%u"
@@ -1596,10 +1596,9 @@ rte_szedata2_uninit(const char *name __rte_unused)
 
 static struct rte_driver rte_szedata2_driver = {
 	.type = PMD_PDEV,
-	.name = RTE_SZEDATA2_DRIVER_NAME,
 	.init = rte_szedata2_init,
 	.uninit = rte_szedata2_uninit,
 };
 
-PMD_REGISTER_DRIVER(rte_szedata2_driver, rte_szedata2_pmd);
-DRIVER_REGISTER_PCI_TABLE(rte_szedata2_pmd, rte_szedata2_pci_id_table);
+PMD_REGISTER_DRIVER(rte_szedata2_driver, RTE_SZEDATA2_DRIVER_NAME);
+DRIVER_REGISTER_PCI_TABLE(RTE_SZEDATA2_DRIVER_NAME, rte_szedata2_pci_id_table);
diff --git a/drivers/net/thunderx/nicvf_ethdev.c b/drivers/net/thunderx/nicvf_ethdev.c
index 7a9fa44..68a72e4 100644
--- a/drivers/net/thunderx/nicvf_ethdev.c
+++ b/drivers/net/thunderx/nicvf_ethdev.c
@@ -1779,7 +1779,6 @@ rte_nicvf_pmd_init(const char *name __rte_unused, const char *para __rte_unused)
 }
 
 static struct rte_driver rte_nicvf_driver = {
-	.name = "nicvf_driver",
 	.type = PMD_PDEV,
 	.init = rte_nicvf_pmd_init,
 };
diff --git a/drivers/net/vhost/rte_eth_vhost.c b/drivers/net/vhost/rte_eth_vhost.c
index a02dd55..e42ee2c 100644
--- a/drivers/net/vhost/rte_eth_vhost.c
+++ b/drivers/net/vhost/rte_eth_vhost.c
@@ -915,7 +915,6 @@ rte_pmd_vhost_devuninit(const char *name)
 }
 
 static struct rte_driver pmd_vhost_drv = {
-	.name = "eth_vhost",
 	.type = PMD_VDEV,
 	.init = rte_pmd_vhost_devinit,
 	.uninit = rte_pmd_vhost_devuninit,
diff --git a/drivers/net/virtio/virtio_user_ethdev.c b/drivers/net/virtio/virtio_user_ethdev.c
index 2ed4380..8eb166e 100644
--- a/drivers/net/virtio/virtio_user_ethdev.c
+++ b/drivers/net/virtio/virtio_user_ethdev.c
@@ -431,7 +431,6 @@ virtio_user_pmd_devuninit(const char *name)
 }
 
 static struct rte_driver virtio_user_driver = {
-	.name   = "virtio-user",
 	.type   = PMD_VDEV,
 	.init   = virtio_user_pmd_devinit,
 	.uninit = virtio_user_pmd_devuninit,
diff --git a/drivers/net/xenvirt/rte_eth_xenvirt.c b/drivers/net/xenvirt/rte_eth_xenvirt.c
index 5122559..b940e94 100644
--- a/drivers/net/xenvirt/rte_eth_xenvirt.c
+++ b/drivers/net/xenvirt/rte_eth_xenvirt.c
@@ -760,7 +760,6 @@ rte_pmd_xenvirt_devuninit(const char *name)
 }
 
 static struct rte_driver pmd_xenvirt_drv = {
-	.name = "eth_xenvirt",
 	.type = PMD_VDEV,
 	.init = rte_pmd_xenvirt_devinit,
 	.uninit = rte_pmd_xenvirt_devuninit,
-- 
2.7.4

[PATCH 3/5] drivers: split driver arguments in multiple lines

[Pablo de Lara]

Driver arguments shown with DRIVER_REGISTER_PARAM_STRING
have been separated in multiple lines and indented to
ease their readability.

Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
---
 drivers/crypto/aesni_gcm/aesni_gcm_pmd.c   |  6 ++++--
 drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c |  6 ++++--
 drivers/crypto/kasumi/rte_kasumi_pmd.c     |  6 ++++--
 drivers/crypto/null/null_crypto_pmd.c      |  6 ++++--
 drivers/crypto/snow3g/rte_snow3g_pmd.c     |  6 ++++--
 drivers/net/af_packet/rte_eth_af_packet.c  |  8 ++++++--
 drivers/net/bonding/rte_eth_bond_pmd.c     | 14 ++++++++++----
 drivers/net/null/rte_eth_null.c            |  4 +++-
 drivers/net/pcap/rte_eth_pcap.c            |  8 ++++++--
 drivers/net/ring/rte_eth_ring.c            |  3 ++-
 drivers/net/vhost/rte_eth_vhost.c          |  4 +++-
 11 files changed, 50 insertions(+), 21 deletions(-)

diff --git a/drivers/crypto/aesni_gcm/aesni_gcm_pmd.c b/drivers/crypto/aesni_gcm/aesni_gcm_pmd.c
index f9be44a..dc0b033 100644
--- a/drivers/crypto/aesni_gcm/aesni_gcm_pmd.c
+++ b/drivers/crypto/aesni_gcm/aesni_gcm_pmd.c
@@ -521,5 +521,7 @@ static struct rte_driver aesni_gcm_pmd_drv = {
 };
 
 PMD_REGISTER_DRIVER(aesni_gcm_pmd_drv, CRYPTODEV_NAME_AESNI_GCM_PMD);
-DRIVER_REGISTER_PARAM_STRING(CRYPTODEV_NAME_AESNI_GCM_PMD, "max_nb_queue_pairs=<int> "
-"max_nb_sessions=<int> socket_id=<int>");
+DRIVER_REGISTER_PARAM_STRING(CRYPTODEV_NAME_AESNI_GCM_PMD,
+	"max_nb_queue_pairs=<int> "
+	"max_nb_sessions=<int> "
+	"socket_id=<int>");
diff --git a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c
index 2140b92..b2d0c8c 100644
--- a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c
+++ b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c
@@ -721,5 +721,7 @@ static struct rte_driver cryptodev_aesni_mb_pmd_drv = {
 };
 
 PMD_REGISTER_DRIVER(cryptodev_aesni_mb_pmd_drv, CRYPTODEV_NAME_AESNI_MB_PMD);
-DRIVER_REGISTER_PARAM_STRING(CRYPTODEV_NAME_AESNI_MB_PMD, "max_nb_queue_pairs=<int> "
-"max_nb_sessions=<int> socket_id=<int>");
+DRIVER_REGISTER_PARAM_STRING(CRYPTODEV_NAME_AESNI_MB_PMD,
+	"max_nb_queue_pairs=<int> "
+	"max_nb_sessions=<int> "
+	"socket_id=<int>");
diff --git a/drivers/crypto/kasumi/rte_kasumi_pmd.c b/drivers/crypto/kasumi/rte_kasumi_pmd.c
index 400a248..1cdbc06 100644
--- a/drivers/crypto/kasumi/rte_kasumi_pmd.c
+++ b/drivers/crypto/kasumi/rte_kasumi_pmd.c
@@ -654,5 +654,7 @@ static struct rte_driver cryptodev_kasumi_pmd_drv = {
 };
 
 PMD_REGISTER_DRIVER(cryptodev_kasumi_pmd_drv, CRYPTODEV_NAME_KASUMI_PMD);
-DRIVER_REGISTER_PARAM_STRING(CRYPTODEV_NAME_KASUMI_PMD, "max_nb_queue_pairs=<int> "
-"max_nb_sessions=<int> socket_id=<int>");
+DRIVER_REGISTER_PARAM_STRING(CRYPTODEV_NAME_KASUMI_PMD,
+	"max_nb_queue_pairs=<int> "
+	"max_nb_sessions=<int> "
+	"socket_id=<int>");
diff --git a/drivers/crypto/null/null_crypto_pmd.c b/drivers/crypto/null/null_crypto_pmd.c
index e03d0eb..909b04f 100644
--- a/drivers/crypto/null/null_crypto_pmd.c
+++ b/drivers/crypto/null/null_crypto_pmd.c
@@ -275,5 +275,7 @@ static struct rte_driver cryptodev_null_pmd_drv = {
 };
 
 PMD_REGISTER_DRIVER(cryptodev_null_pmd_drv, CRYPTODEV_NAME_NULL_PMD);
-DRIVER_REGISTER_PARAM_STRING(CRYPTODEV_NAME_NULL_PMD, "max_nb_queue_pairs=<int> "
-"max_nb_sessions=<int> socket_id=<int>");
+DRIVER_REGISTER_PARAM_STRING(CRYPTODEV_NAME_NULL_PMD,
+	"max_nb_queue_pairs=<int> "
+	"max_nb_sessions=<int> "
+	"socket_id=<int>");
diff --git a/drivers/crypto/snow3g/rte_snow3g_pmd.c b/drivers/crypto/snow3g/rte_snow3g_pmd.c
index a474a4d..87cd070 100644
--- a/drivers/crypto/snow3g/rte_snow3g_pmd.c
+++ b/drivers/crypto/snow3g/rte_snow3g_pmd.c
@@ -645,5 +645,7 @@ static struct rte_driver cryptodev_snow3g_pmd_drv = {
 };
 
 PMD_REGISTER_DRIVER(cryptodev_snow3g_pmd_drv, CRYPTODEV_NAME_SNOW3G_PMD);
-DRIVER_REGISTER_PARAM_STRING(CRYPTODEV_NAME_SNOW3G_PMD, "max_nb_queue_pairs=<int> "
-"max_nb_sessions=<int> socket_id=<int>");
+DRIVER_REGISTER_PARAM_STRING(CRYPTODEV_NAME_SNOW3G_PMD,
+	"max_nb_queue_pairs=<int> "
+	"max_nb_sessions=<int> "
+	"socket_id=<int>");
diff --git a/drivers/net/af_packet/rte_eth_af_packet.c b/drivers/net/af_packet/rte_eth_af_packet.c
index 238eed8..f795566 100644
--- a/drivers/net/af_packet/rte_eth_af_packet.c
+++ b/drivers/net/af_packet/rte_eth_af_packet.c
@@ -896,5 +896,9 @@ static struct rte_driver pmd_af_packet_drv = {
 };
 
 PMD_REGISTER_DRIVER(pmd_af_packet_drv, eth_af_packet);
-DRIVER_REGISTER_PARAM_STRING(eth_af_packet, "iface=<string> "
-"qpairs=<int> blocksz=<int> framesz=<int> framecnt=<int>");
+DRIVER_REGISTER_PARAM_STRING(eth_af_packet,
+	"iface=<string> "
+	"qpairs=<int> "
+	"blocksz=<int> "
+	"framesz=<int> "
+	"framecnt=<int>");
diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c
index 0361be3..f617eea 100644
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -2516,7 +2516,13 @@ static struct rte_driver bond_drv = {
 
 PMD_REGISTER_DRIVER(bond_drv, eth_bond);
 
-DRIVER_REGISTER_PARAM_STRING(eth_bond, "slave=<ifc> primary=<ifc> mode=[0-4] "
-"xmit_policy=[l2 | l23 | l34] socket_id=<int> mac=<mac addr> "
-"lsc_poll_period_ms=<int> up_delay=<int> down_delay=<int>");
-
+DRIVER_REGISTER_PARAM_STRING(eth_bond,
+	"slave=<ifc> "
+	"primary=<ifc> "
+	"mode=[0-4] "
+	"xmit_policy=[l2 | l23 | l34] "
+	"socket_id=<int> "
+	"mac=<mac addr> "
+	"lsc_poll_period_ms=<int> "
+	"up_delay=<int> "
+	"down_delay=<int>");
diff --git a/drivers/net/null/rte_eth_null.c b/drivers/net/null/rte_eth_null.c
index 367b884..7a24884 100644
--- a/drivers/net/null/rte_eth_null.c
+++ b/drivers/net/null/rte_eth_null.c
@@ -693,4 +693,6 @@ static struct rte_driver pmd_null_drv = {
 };
 
 PMD_REGISTER_DRIVER(pmd_null_drv, eth_null);
-DRIVER_REGISTER_PARAM_STRING(eth_null, "size=<int> copy=<int>");
+DRIVER_REGISTER_PARAM_STRING(eth_null,
+	"size=<int> "
+	"copy=<int>");
diff --git a/drivers/net/pcap/rte_eth_pcap.c b/drivers/net/pcap/rte_eth_pcap.c
index 1bcd7e5..7e213eb 100644
--- a/drivers/net/pcap/rte_eth_pcap.c
+++ b/drivers/net/pcap/rte_eth_pcap.c
@@ -1090,5 +1090,9 @@ static struct rte_driver pmd_pcap_drv = {
 };
 
 PMD_REGISTER_DRIVER(pmd_pcap_drv, eth_pcap);
-DRIVER_REGISTER_PARAM_STRING(eth_pcap, "rx_pcap=<string> tx_pcap=<string> "
-"rx_iface=<ifc> tx_iface=<ifc> iface=<ifc>");
+DRIVER_REGISTER_PARAM_STRING(eth_pcap,
+	"rx_pcap=<string> "
+	"tx_pcap=<string> "
+	"rx_iface=<ifc> "
+	"tx_iface=<ifc> "
+	"iface=<ifc>");
diff --git a/drivers/net/ring/rte_eth_ring.c b/drivers/net/ring/rte_eth_ring.c
index dee5038..a7048c7 100644
--- a/drivers/net/ring/rte_eth_ring.c
+++ b/drivers/net/ring/rte_eth_ring.c
@@ -630,4 +630,5 @@ static struct rte_driver pmd_ring_drv = {
 };
 
 PMD_REGISTER_DRIVER(pmd_ring_drv, eth_ring);
-DRIVER_REGISTER_PARAM_STRING(eth_ring, "nodeaction=[attach|detach]");
+DRIVER_REGISTER_PARAM_STRING(eth_ring,
+	"nodeaction=[attach|detach]");
diff --git a/drivers/net/vhost/rte_eth_vhost.c b/drivers/net/vhost/rte_eth_vhost.c
index e42ee2c..596faea 100644
--- a/drivers/net/vhost/rte_eth_vhost.c
+++ b/drivers/net/vhost/rte_eth_vhost.c
@@ -921,4 +921,6 @@ static struct rte_driver pmd_vhost_drv = {
 };
 
 PMD_REGISTER_DRIVER(pmd_vhost_drv, eth_vhost);
-DRIVER_REGISTER_PARAM_STRING(eth_vhost, "iface=<ifc> queues=<int>");
+DRIVER_REGISTER_PARAM_STRING(eth_vhost,
+	"iface=<ifc> "
+	"queues=<int>");
-- 
2.7.4

[PATCH 4/5] drivers: add missing virtio and xenvirt arguments

[Pablo de Lara]

Virtio and Xenvirt are two virtual device drivers that admit
arguments, so DRIVER_REGISTER_PARAM_STRING should be used
in them.

Fixes: cb6696d22023 ("drivers: update registration macro usage")

Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
---
 drivers/net/virtio/virtio_user_ethdev.c | 6 ++++++
 drivers/net/xenvirt/rte_eth_xenvirt.c   | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/drivers/net/virtio/virtio_user_ethdev.c b/drivers/net/virtio/virtio_user_ethdev.c
index 8eb166e..27b6d60 100644
--- a/drivers/net/virtio/virtio_user_ethdev.c
+++ b/drivers/net/virtio/virtio_user_ethdev.c
@@ -437,3 +437,9 @@ static struct rte_driver virtio_user_driver = {
 };
 
 PMD_REGISTER_DRIVER(virtio_user_driver, virtio_user);
+DRIVER_REGISTER_PARAM_STRING(virtio_user,
+	"path=<path> "
+	"mac=<mac addr> "
+	"cq=<int> "
+	"queue_size=<int> "
+	"queues=<int>");
diff --git a/drivers/net/xenvirt/rte_eth_xenvirt.c b/drivers/net/xenvirt/rte_eth_xenvirt.c
index b940e94..99f6cc8 100644
--- a/drivers/net/xenvirt/rte_eth_xenvirt.c
+++ b/drivers/net/xenvirt/rte_eth_xenvirt.c
@@ -766,3 +766,5 @@ static struct rte_driver pmd_xenvirt_drv = {
 };
 
 PMD_REGISTER_DRIVER(pmd_xenvirt_drv, eth_xenvirt);
+DRIVER_REGISTER_PARAM_STRING(eth_xenvirt,
+	"mac=<mac addr>");
-- 
2.7.4

[PATCH 5/5] net/bonding: fix range of mode argument

[Pablo de Lara]

The range of the supported bonding modes is 0-6, instead of 0-4.

Fixes: cb6696d22023 ("drivers: update registration macro usage")

Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
---
 drivers/net/bonding/rte_eth_bond_pmd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c
index f617eea..b20a272 100644
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -2519,7 +2519,7 @@ PMD_REGISTER_DRIVER(bond_drv, eth_bond);
 DRIVER_REGISTER_PARAM_STRING(eth_bond,
 	"slave=<ifc> "
 	"primary=<ifc> "
-	"mode=[0-4] "
+	"mode=[0-6] "
 	"xmit_policy=[l2 | l23 | l34] "
 	"socket_id=<int> "
 	"mac=<mac addr> "
-- 
2.7.4

Re: [PATCH 0/5] Driver register fixes

[Neil Horman]

On Sat, Jul 09, 2016 at 02:06:09AM +0100, Pablo de Lara wrote:
> This patchset makes some extra changes after the modification
> of the PMD_REGISTER_DRIVER macro, including renaming back
> some virtual device driver names (virtio could not be renamed)
> and fixing/adding arguments of some drivers. 
> 
> Pablo de Lara (5):
>   drivers: revert vdev driver names to original
>   drivers: remove static driver names
>   drivers: split driver arguments in multiple lines
>   drivers: add missing virtio and xenvirt arguments
>   net/bonding: fix range of mode argument
> 
>  drivers/crypto/aesni_gcm/aesni_gcm_pmd.c   |  6 ++++--
>  drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c |  6 ++++--
>  drivers/crypto/kasumi/rte_kasumi_pmd.c     |  6 ++++--
>  drivers/crypto/null/null_crypto_pmd.c      |  6 ++++--
>  drivers/crypto/snow3g/rte_snow3g_pmd.c     |  6 ++++--
>  drivers/net/af_packet/rte_eth_af_packet.c  |  9 ++++++---
>  drivers/net/bnxt/bnxt_ethdev.c             |  1 -
>  drivers/net/bonding/rte_eth_bond_pmd.c     | 19 ++++++++++++-------
>  drivers/net/cxgbe/cxgbe_ethdev.c           |  1 -
>  drivers/net/ena/ena_ethdev.c               |  1 -
>  drivers/net/mlx4/mlx4.c                    |  1 -
>  drivers/net/mlx5/mlx5.c                    |  1 -
>  drivers/net/mpipe/mpipe_tilegx.c           |  6 ++----
>  drivers/net/null/rte_eth_null.c            |  5 +++--
>  drivers/net/pcap/rte_eth_pcap.c            | 11 +++++++----
>  drivers/net/ring/rte_eth_ring.c            |  4 ++--
>  drivers/net/szedata2/rte_eth_szedata2.c    |  7 +++----
>  drivers/net/thunderx/nicvf_ethdev.c        |  1 -
>  drivers/net/vhost/rte_eth_vhost.c          |  5 +++--
>  drivers/net/virtio/virtio_user_ethdev.c    |  7 ++++++-
>  drivers/net/xenvirt/rte_eth_xenvirt.c      |  5 +++--
>  21 files changed, 67 insertions(+), 47 deletions(-)
> 
> -- 
> 2.7.4
> 
> 
Series
Acked-by: Neil Horman <nhorman@tuxdriver.com>

Re: [PATCH 0/5] Driver register fixes

[Thomas Monjalon]

2016-07-09 09:45, Neil Horman:
> On Sat, Jul 09, 2016 at 02:06:09AM +0100, Pablo de Lara wrote:
> > This patchset makes some extra changes after the modification
> > of the PMD_REGISTER_DRIVER macro, including renaming back
> > some virtual device driver names (virtio could not be renamed)
> > and fixing/adding arguments of some drivers. 
> > 
> > Pablo de Lara (5):
> >   drivers: revert vdev driver names to original
> >   drivers: remove static driver names
> >   drivers: split driver arguments in multiple lines
> >   drivers: add missing virtio and xenvirt arguments
> >   net/bonding: fix range of mode argument
> > 
> Series
> Acked-by: Neil Horman <nhorman@tuxdriver.com>

Applied, thanks