diff options
author | Tom Gundersen <teg@jklm.no> | 2014-07-14 10:37:24 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-07-15 19:12:48 -0400 |
commit | c835a677331495cf137a7f8a023463afd9f032f8 (patch) | |
tree | ca1b7c3aa3c2404f7912388e70f7e0cb9cf37043 /drivers/net/ethernet | |
parent | 238fa3623a5709d29673ed78ff8e714d040fbb89 (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/ethernet')
-rw-r--r-- | drivers/net/ethernet/8390/lib8390.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/tile/tilegx.c | 4 | ||||
-rw-r--r-- | drivers/net/ethernet/tile/tilepro.c | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/ethernet/8390/lib8390.c b/drivers/net/ethernet/8390/lib8390.c index 599311f0e05c..b96e8852b2d1 100644 --- a/drivers/net/ethernet/8390/lib8390.c +++ b/drivers/net/ethernet/8390/lib8390.c | |||
@@ -986,7 +986,7 @@ static void ethdev_setup(struct net_device *dev) | |||
986 | static struct net_device *____alloc_ei_netdev(int size) | 986 | static struct net_device *____alloc_ei_netdev(int size) |
987 | { | 987 | { |
988 | return alloc_netdev(sizeof(struct ei_device) + size, "eth%d", | 988 | return alloc_netdev(sizeof(struct ei_device) + size, "eth%d", |
989 | ethdev_setup); | 989 | NET_NAME_UNKNOWN, ethdev_setup); |
990 | } | 990 | } |
991 | 991 | ||
992 | 992 | ||
diff --git a/drivers/net/ethernet/tile/tilegx.c b/drivers/net/ethernet/tile/tilegx.c index 4c70360967c2..69557a26f749 100644 --- a/drivers/net/ethernet/tile/tilegx.c +++ b/drivers/net/ethernet/tile/tilegx.c | |||
@@ -2201,8 +2201,8 @@ static void tile_net_dev_init(const char *name, const uint8_t *mac) | |||
2201 | /* Allocate the device structure. Normally, "name" is a | 2201 | /* Allocate the device structure. Normally, "name" is a |
2202 | * template, instantiated by register_netdev(), but not for us. | 2202 | * template, instantiated by register_netdev(), but not for us. |
2203 | */ | 2203 | */ |
2204 | dev = alloc_netdev_mqs(sizeof(*priv), name, tile_net_setup, | 2204 | dev = alloc_netdev_mqs(sizeof(*priv), name, NET_NAME_UNKNOWN, |
2205 | NR_CPUS, 1); | 2205 | tile_net_setup, NR_CPUS, 1); |
2206 | if (!dev) { | 2206 | if (!dev) { |
2207 | pr_err("alloc_netdev_mqs(%s) failed\n", name); | 2207 | pr_err("alloc_netdev_mqs(%s) failed\n", name); |
2208 | return; | 2208 | return; |
diff --git a/drivers/net/ethernet/tile/tilepro.c b/drivers/net/ethernet/tile/tilepro.c index e5a5c5d4ce0c..88c712126692 100644 --- a/drivers/net/ethernet/tile/tilepro.c +++ b/drivers/net/ethernet/tile/tilepro.c | |||
@@ -2292,7 +2292,8 @@ static struct net_device *tile_net_dev_init(const char *name) | |||
2292 | * tile_net_setup(), and saves "name". Normally, "name" is a | 2292 | * tile_net_setup(), and saves "name". Normally, "name" is a |
2293 | * template, instantiated by register_netdev(), but not for us. | 2293 | * template, instantiated by register_netdev(), but not for us. |
2294 | */ | 2294 | */ |
2295 | dev = alloc_netdev(sizeof(*priv), name, tile_net_setup); | 2295 | dev = alloc_netdev(sizeof(*priv), name, NET_NAME_UNKNOWN, |
2296 | tile_net_setup); | ||
2296 | if (!dev) { | 2297 | if (!dev) { |
2297 | pr_err("alloc_netdev(%s) failed\n", name); | 2298 | pr_err("alloc_netdev(%s) failed\n", name); |
2298 | return NULL; | 2299 | return NULL; |