net/miiphy/serial: drop duplicate "NAMESIZE" define

A few subsystems are using the same define "NAMESIZE".  This has been
working so far because they define it to the same number.  However, I
want to change the size of eth_device's NAMESIZE, so rather than tweak
the define names, simply drop references to it.  Almost no one does,
and the handful that do can easily be changed to a sizeof().

Signed-off-by: Mike Frysinger <vapier@gentoo.org>

diff --git a/board/Marvell/db64360/mv_eth.c b/board/Marvell/db64360/mv_eth.c
index 6340585e8509b4383a5b9babfb0d2da460da2d6e..e89ea43d7b5faadb03a6ec8579a422d045deaa10 100644 (file)
--- a/board/Marvell/db64360/mv_eth.c
+++ b/board/Marvell/db64360/mv_eth.c
@@ -221,7 +221,7 @@ void mv6436x_eth_initialize (bd_t * bis)
                        return;
                }
 
-               /* must be less than NAMESIZE (16) */
+               /* must be less than sizeof(dev->name) */
                sprintf (dev->name, "mv_enet%d", devnum);
 
 #ifdef DEBUG

diff --git a/board/Marvell/db64460/mv_eth.c b/board/Marvell/db64460/mv_eth.c
index 4aefbaf0c1f1ddbc27820b39e5563a094a8ba77f..a763d795cbc4fa3dbba0c082a23a077c273c049c 100644 (file)
--- a/board/Marvell/db64460/mv_eth.c
+++ b/board/Marvell/db64460/mv_eth.c
@@ -221,7 +221,7 @@ void mv6446x_eth_initialize (bd_t * bis)
                        return;
                }
 
-               /* must be less than NAMESIZE (16) */
+               /* must be less than sizeof(dev->name) */
                sprintf (dev->name, "mv_enet%d", devnum);
 
 #ifdef DEBUG

diff --git a/board/esd/cpci750/mv_eth.c b/board/esd/cpci750/mv_eth.c
index 001c1ad44e54af3d7edc54de909484b9a96e4c70..a3bde815752ae5bad56c9f8d0a911cc3868843a5 100644 (file)
--- a/board/esd/cpci750/mv_eth.c
+++ b/board/esd/cpci750/mv_eth.c
@@ -221,7 +221,7 @@ void mv6436x_eth_initialize (bd_t * bis)
                        return;
                }
 
-               /* must be less than NAMESIZE (16) */
+               /* must be less than sizeof(dev->name) */
                sprintf (dev->name, "mv_enet%d", devnum);
 
 #ifdef DEBUG

diff --git a/board/evb64260/eth.c b/board/evb64260/eth.c
index c02a9cdfddf29e11fdcb6626a6a2b91b99e7fc0e..eb87edcbfec7d8e322e3cb32047e8a1711e55ff7 100644 (file)
--- a/board/evb64260/eth.c
+++ b/board/evb64260/eth.c
@@ -686,7 +686,7 @@ gt6426x_eth_initialize(bd_t *bis)
                        return;
                }
 
-               /* must be less than NAMESIZE (16) */
+               /* must be less than sizeof(dev->name) */
                sprintf(dev->name, "gal_enet%d", devnum);
 
 #ifdef DEBUG

diff --git a/board/prodrive/p3mx/mv_eth.c b/board/prodrive/p3mx/mv_eth.c
index 15b3bfc0841f5c29a7808a8060d5d15a881f8ec9..9e3213bdff424ccb6285a45982c0811505c9dcab 100644 (file)
--- a/board/prodrive/p3mx/mv_eth.c
+++ b/board/prodrive/p3mx/mv_eth.c
@@ -274,7 +274,7 @@ void mv6446x_eth_initialize (bd_t * bis)
                        return;
                }
 
-               /* must be less than NAMESIZE (16) */
+               /* must be less than sizeof(dev->name) */
                sprintf (dev->name, "mv_enet%d", devnum);
 
 #ifdef DEBUG

diff --git a/drivers/net/armada100_fec.c b/drivers/net/armada100_fec.c
index 1a54362e0b76ad3af267927a98cf24dedd73c398..52be3a7195d00bbe8d2f356c7abf8405524abaf4 100644 (file)
--- a/drivers/net/armada100_fec.c
+++ b/drivers/net/armada100_fec.c
@@ -715,7 +715,7 @@ int armada100_fec_register(unsigned long base_addr)
        /* Assign ARMADA100 Fast Ethernet Controller Base Address */
        darmdfec->regs = (void *)base_addr;
 
-       /* must be less than NAMESIZE (16) */
+       /* must be less than sizeof(dev->name) */
        strcpy(dev->name, "armd-fec0");
 
        dev->init = armdfec_init;

diff --git a/drivers/net/mvgbe.c b/drivers/net/mvgbe.c
index 1dcb700161289e954d8273dc48b97ad0b2dca905..477bf5c1325cafc7d5a621e3b4163ecf396df67d 100644 (file)
--- a/drivers/net/mvgbe.c
+++ b/drivers/net/mvgbe.c
@@ -702,7 +702,7 @@ error1:
 
                dev = &dmvgbe->dev;
 
-               /* must be less than NAMESIZE (16) */
+               /* must be less than sizeof(dev->name) */
                sprintf(dev->name, "egiga%d", devnum);
 
                switch (devnum) {

diff --git a/drivers/qe/uec_phy.c b/drivers/qe/uec_phy.c
index e26218be88afc64e41d35c0fd99b0927bf33824f..ac580a0da746c35e37a901755e1bf99332cc700e 100644 (file)
--- a/drivers/qe/uec_phy.c
+++ b/drivers/qe/uec_phy.c
@@ -85,7 +85,7 @@
 #endif
 
 struct fixed_phy_port {
-       char name[NAMESIZE];    /* ethernet port name */
+       char name[16];  /* ethernet port name */
        unsigned int speed;     /* specified speed 10,100 or 1000 */
        unsigned int duplex;    /* specified duplex FULL or HALF */
 };

diff --git a/include/miiphy.h b/include/miiphy.h
index 7e70cf81e4d3d49e7a171c8af50ed39cb93e0da6..ca5040ed8d409f695154c4fb42ba8f75e230c8b5 100644 (file)
--- a/include/miiphy.h
+++ b/include/miiphy.h
@@ -86,7 +86,7 @@ void mdio_list_devices(void);
 #define BB_MII_DEVNAME "bb_miiphy"
 
 struct bb_miiphy_bus {
-       char name[NAMESIZE];
+       char name[16];
        int (*init)(struct bb_miiphy_bus *bus);
        int (*mdio_active)(struct bb_miiphy_bus *bus);
        int (*mdio_tristate)(struct bb_miiphy_bus *bus);

diff --git a/include/net.h b/include/net.h
index 1707a7fbec5fff2f64faf1c1f3faf55171297121..556078518b584dfe14fcba5298accd1466a100bf 100644 (file)
--- a/include/net.h
+++ b/include/net.h
@@ -67,8 +67,6 @@ typedef void rxhand_icmp_f(unsigned type, unsigned code, unsigned dport,
  */
 typedef void   thand_f(void);
 
-#define NAMESIZE 16
-
 enum eth_state_t {
        ETH_STATE_INIT,
        ETH_STATE_PASSIVE,
@@ -76,7 +74,7 @@ enum eth_state_t {
 };
 
 struct eth_device {
-       char name[NAMESIZE];
+       char name[16];
        unsigned char enetaddr[6];
        int iobase;
        int state;

diff --git a/include/serial.h b/include/serial.h
index a298a0bab195a93877186aba7837892020506614..5173499124091870efaca83feb615d377054ed34 100644 (file)
--- a/include/serial.h
+++ b/include/serial.h
@@ -3,10 +3,9 @@
 
 #include <post.h>
 
-#define NAMESIZE 16
-
 struct serial_device {
-       char name[NAMESIZE];
+       /* enough bytes to match alignment of following func pointer */
+       char name[16];
 
        int  (*init) (void);
        int  (*uninit) (void);

diff --git a/net/eth.c b/net/eth.c
index f14767b24afffbecea23e93f3b16e3225a650544..aed4dd6cddb4d54de0f246dba9b191e33ba5ad68 100644 (file)
--- a/net/eth.c
+++ b/net/eth.c
@@ -203,7 +203,7 @@ int eth_register(struct eth_device *dev)
        struct eth_device *d;
        static int index = 0;
 
-       assert(strlen(dev->name) < NAMESIZE);
+       assert(strlen(dev->name) < sizeof(dev->name));
 
        if (!eth_devices) {
                eth_current = eth_devices = dev;