summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2011-11-10 14:11:04 +0000
committerWolfgang Denk <wd@denx.de>2012-03-18 20:11:22 +0100
commitf6add132f6d7f45eb7d4b3839513c38bfb28eb08 (patch)
tree02da84cb248aaab568c2283a2bbecd9ee91a098b /include
parent2b224609568988a7d8db22d372b232a69155733f (diff)
downloadu-boot-imx-f6add132f6d7f45eb7d4b3839513c38bfb28eb08.zip
u-boot-imx-f6add132f6d7f45eb7d4b3839513c38bfb28eb08.tar.gz
u-boot-imx-f6add132f6d7f45eb7d4b3839513c38bfb28eb08.tar.bz2
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>
Diffstat (limited to 'include')
-rw-r--r--include/miiphy.h2
-rw-r--r--include/net.h4
-rw-r--r--include/serial.h5
3 files changed, 4 insertions, 7 deletions
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 @@ 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 1707a7f..5560785 100644
--- 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 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);