net: set name_assign_type in alloc_netdev()

Extend alloc_netdev{,_mq{,s}}() to take name_assign_type as argument, and convert
all users to pass NET_NAME_UNKNOWN.

Coccinelle patch:

@@
expression sizeof_priv, name, setup, txqs, rxqs, count;
@@

(
-alloc_netdev_mqs(sizeof_priv, name, setup, txqs, rxqs)
+alloc_netdev_mqs(sizeof_priv, name, NET_NAME_UNKNOWN, setup, txqs, rxqs)
|
-alloc_netdev_mq(sizeof_priv, name, setup, count)
+alloc_netdev_mq(sizeof_priv, name, NET_NAME_UNKNOWN, setup, count)
|
-alloc_netdev(sizeof_priv, name, setup)
+alloc_netdev(sizeof_priv, name, NET_NAME_UNKNOWN, setup)
)

v9: move comments here from the wrong commit

Signed-off-by: Tom Gundersen <teg@jklm.no>
Reviewed-by: David Herrmann <dh.herrmann@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

5 files changed, 12 insertions, 7 deletions

diff --git a/drivers/s390/net/claw.c b/drivers/s390/net/claw.c
index d837c3c5330f..fbc6701bef30 100644
--- a/drivers/s390/net/claw.c
+++ b/drivers/s390/net/claw.c
@@ -2915,7 +2915,7 @@ claw_new_device(struct ccwgroup_device *cgdev)
                         "failed with error code %d\n", ret);
                 goto out;
         }
-        dev = alloc_netdev(0,"claw%d",claw_init_netdevice);
+        dev = alloc_netdev(0, "claw%d", NET_NAME_UNKNOWN, claw_init_netdevice);
         if (!dev) {
                 dev_warn(&cgdev->dev,
                         "Activating the CLAW device failed\n");
diff --git a/drivers/s390/net/ctcm_main.c b/drivers/s390/net/ctcm_main.c
index 03b6ad035577..e056dd4fe44d 100644
--- a/drivers/s390/net/ctcm_main.c
+++ b/drivers/s390/net/ctcm_main.c
@@ -1137,9 +1137,11 @@ static struct net_device *ctcm_init_netdevice(struct ctcm_priv *priv)
                 return NULL;
 
         if (IS_MPC(priv))
-                dev = alloc_netdev(0, MPC_DEVICE_GENE, ctcm_dev_setup);
+                dev = alloc_netdev(0, MPC_DEVICE_GENE, NET_NAME_UNKNOWN,
+                                   ctcm_dev_setup);
         else
-                dev = alloc_netdev(0, CTC_DEVICE_GENE, ctcm_dev_setup);
+                dev = alloc_netdev(0, CTC_DEVICE_GENE, NET_NAME_UNKNOWN,
+                                   ctcm_dev_setup);
 
         if (!dev) {
                 CTCM_DBF_TEXT_(ERROR, CTC_DBF_CRIT,
diff --git a/drivers/s390/net/netiucv.c b/drivers/s390/net/netiucv.c
index ce16d1bdb20a..0a87809c8af7 100644
--- a/drivers/s390/net/netiucv.c
+++ b/drivers/s390/net/netiucv.c
@@ -2015,7 +2015,7 @@ static struct net_device *netiucv_init_netdevice(char *username, char *userdata)
         struct net_device *dev;
 
         dev = alloc_netdev(sizeof(struct netiucv_priv), "iucv%d",
-                           netiucv_setup_netdevice);
+                           NET_NAME_UNKNOWN, netiucv_setup_netdevice);
         if (!dev)
                 return NULL;
         rtnl_lock();
diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c
index 5ef5b4f45758..c2679bfe7f66 100644
--- a/drivers/s390/net/qeth_l2_main.c
+++ b/drivers/s390/net/qeth_l2_main.c
@@ -952,10 +952,12 @@ static int qeth_l2_setup_netdev(struct qeth_card *card)
 {
         switch (card->info.type) {
         case QETH_CARD_TYPE_IQD:
-                card->dev = alloc_netdev(0, "hsi%d", ether_setup);
+                card->dev = alloc_netdev(0, "hsi%d", NET_NAME_UNKNOWN,
+                                         ether_setup);
                 break;
         case QETH_CARD_TYPE_OSN:
-                card->dev = alloc_netdev(0, "osn%d", ether_setup);
+                card->dev = alloc_netdev(0, "osn%d", NET_NAME_UNKNOWN,
+                                         ether_setup);
                 card->dev->flags |= IFF_NOARP;
                 break;
         default:
diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c
index 14e0b5810e8c..f8427a2c4840 100644
--- a/drivers/s390/net/qeth_l3_main.c
+++ b/drivers/s390/net/qeth_l3_main.c
@@ -3287,7 +3287,8 @@ static int qeth_l3_setup_netdev(struct qeth_card *card)
                         }
                 }
         } else if (card->info.type == QETH_CARD_TYPE_IQD) {
-                card->dev = alloc_netdev(0, "hsi%d", ether_setup);
+                card->dev = alloc_netdev(0, "hsi%d", NET_NAME_UNKNOWN,
+                                         ether_setup);
                 if (!card->dev)
                         return -ENODEV;
                 card->dev->flags |= IFF_NOARP;