From f6add132f6d7f45eb7d4b3839513c38bfb28eb08 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Thu, 10 Nov 2011 14:11:04 +0000 Subject: 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 --- drivers/net/armada100_fec.c | 2 +- drivers/net/mvgbe.c | 2 +- drivers/qe/uec_phy.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'drivers') diff --git a/drivers/net/armada100_fec.c b/drivers/net/armada100_fec.c index 1a54362e0b..52be3a7195 100644 --- 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 1dcb700161..477bf5c132 100644 --- 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 e26218be88..ac580a0da7 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 */ }; -- cgit v1.2.3