Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

[oweals/u-boot.git] / net / eth.c

diff --git a/net/eth.c b/net/eth.c
index 5911b1c78609578dca32525ad29431795721b7f8..1c0c78005e8058b29c513101617832451d2d7f8c 100644 (file)
--- a/net/eth.c
+++ b/net/eth.c
@@ -227,12 +227,7 @@ int eth_register(struct eth_device *dev)
 {
        struct eth_device *d;
 
-       size_t len = strlen(dev->name);
-       if (len >= NAMESIZE) {
-               printf("Network driver name is too long (%zu >= %zu): %s\n",
-                                               len, NAMESIZE, dev->name);
-               return -1;
-       }
+       assert(strlen(dev->name) < NAMESIZE);
 
        if (!eth_devices) {
                eth_current = eth_devices = dev;
@@ -307,7 +302,7 @@ int eth_initialize(bd_t *bis)
                                puts("\nWarning: eth device name has a space!\n");
 
                        if (eth_write_hwaddr(dev, "eth", eth_number))
-                               puts("Warning: failed to set MAC address\n");
+                               puts("\nWarning: failed to set MAC address\n");
 
                        eth_number++;
                        dev = dev->next;