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 6340585..e89ea43 100644
--- a/board/Marvell/db64360/mv_eth.c
+++ b/board/Marvell/db64360/mv_eth.c
@@ -221,7 +221,7 @@
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 4aefbaf..a763d79 100644
--- a/board/Marvell/db64460/mv_eth.c
+++ b/board/Marvell/db64460/mv_eth.c
@@ -221,7 +221,7 @@
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 001c1ad..a3bde81 100644
--- a/board/esd/cpci750/mv_eth.c
+++ b/board/esd/cpci750/mv_eth.c
@@ -221,7 +221,7 @@
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 c02a9cd..eb87edc 100644
--- a/board/evb64260/eth.c
+++ b/board/evb64260/eth.c
@@ -686,7 +686,7 @@
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 15b3bfc..9e3213b 100644
--- a/board/prodrive/p3mx/mv_eth.c
+++ b/board/prodrive/p3mx/mv_eth.c
@@ -274,7 +274,7 @@
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 1a54362..52be3a7 100644
--- a/drivers/net/armada100_fec.c
+++ b/drivers/net/armada100_fec.c
@@ -715,7 +715,7 @@
/* 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 1dcb700..477bf5c 100644
--- a/drivers/net/mvgbe.c
+++ b/drivers/net/mvgbe.c
@@ -702,7 +702,7 @@
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 e26218b..ac580a0 100644
--- 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 7e70cf8..ca5040e 100644
--- a/include/miiphy.h
+++ b/include/miiphy.h
@@ -86,7 +86,7 @@
#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 1707a7f..5560785 100644
--- a/include/net.h
+++ b/include/net.h
@@ -67,8 +67,6 @@
*/
typedef void thand_f(void);
-#define NAMESIZE 16
-
enum eth_state_t {
ETH_STATE_INIT,
ETH_STATE_PASSIVE,
@@ -76,7 +74,7 @@
};
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 a298a0b..5173499 100644
--- 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 f14767b..aed4dd6 100644
--- a/net/eth.c
+++ b/net/eth.c
@@ -203,7 +203,7 @@
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;