aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/caif
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2014-07-14 10:37:24 -0400
committerDavid S. Miller <davem@davemloft.net>2014-07-15 19:12:48 -0400
commitc835a677331495cf137a7f8a023463afd9f032f8 (patch)
treeca1b7c3aa3c2404f7912388e70f7e0cb9cf37043 /drivers/net/caif
parent238fa3623a5709d29673ed78ff8e714d040fbb89 (diff)
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>
Diffstat (limited to 'drivers/net/caif')
-rw-r--r--drivers/net/caif/caif_serial.c3
-rw-r--r--drivers/net/caif/caif_spi.c4
-rw-r--r--drivers/net/caif/caif_virtio.c2
3 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/caif/caif_serial.c b/drivers/net/caif/caif_serial.c
index fc73865bb83a..27bbc56de15f 100644
--- a/drivers/net/caif/caif_serial.c
+++ b/drivers/net/caif/caif_serial.c
@@ -349,7 +349,8 @@ static int ldisc_open(struct tty_struct *tty)
349 result = snprintf(name, sizeof(name), "cf%s", tty->name); 349 result = snprintf(name, sizeof(name), "cf%s", tty->name);
350 if (result >= IFNAMSIZ) 350 if (result >= IFNAMSIZ)
351 return -EINVAL; 351 return -EINVAL;
352 dev = alloc_netdev(sizeof(*ser), name, caifdev_setup); 352 dev = alloc_netdev(sizeof(*ser), name, NET_NAME_UNKNOWN,
353 caifdev_setup);
353 if (!dev) 354 if (!dev)
354 return -ENOMEM; 355 return -ENOMEM;
355 356
diff --git a/drivers/net/caif/caif_spi.c b/drivers/net/caif/caif_spi.c
index ff54c0eb2052..72ea9ff9bb9c 100644
--- a/drivers/net/caif/caif_spi.c
+++ b/drivers/net/caif/caif_spi.c
@@ -730,8 +730,8 @@ int cfspi_spi_probe(struct platform_device *pdev)
730 int res; 730 int res;
731 dev = (struct cfspi_dev *)pdev->dev.platform_data; 731 dev = (struct cfspi_dev *)pdev->dev.platform_data;
732 732
733 ndev = alloc_netdev(sizeof(struct cfspi), 733 ndev = alloc_netdev(sizeof(struct cfspi), "cfspi%d",
734 "cfspi%d", cfspi_setup); 734 NET_NAME_UNKNOWN, cfspi_setup);
735 if (!dev) 735 if (!dev)
736 return -ENODEV; 736 return -ENODEV;
737 737
diff --git a/drivers/net/caif/caif_virtio.c b/drivers/net/caif/caif_virtio.c
index 985608634f8c..a5fefb9059c5 100644
--- a/drivers/net/caif/caif_virtio.c
+++ b/drivers/net/caif/caif_virtio.c
@@ -661,7 +661,7 @@ static int cfv_probe(struct virtio_device *vdev)
661 int err = -EINVAL; 661 int err = -EINVAL;
662 662
663 netdev = alloc_netdev(sizeof(struct cfv_info), cfv_netdev_name, 663 netdev = alloc_netdev(sizeof(struct cfv_info), cfv_netdev_name,
664 cfv_netdev_setup); 664 NET_NAME_UNKNOWN, cfv_netdev_setup);
665 if (!netdev) 665 if (!netdev)
666 return -ENOMEM; 666 return -ENOMEM;
667 667