[PATCH] gt96100eth.c: Don't concatenate __FUNCTION__ with strings.
As part of the ISO C9x conversion gcc deprecates concatenation with __FUNCTION__ because __FUNCTION__ is not a preprocessor macro. Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Maximilian Attems <janitor@sternwelten.at> Signed-off-by: Domen Puncer <domen@coderock.org> Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
This commit is contained in:
Родитель
5579345546
Коммит
560c22fe1f
|
@ -72,8 +72,6 @@ static void dump_tx_desc(int dbg_lvl, struct net_device *dev, int i);
|
||||||
static void dump_rx_desc(int dbg_lvl, struct net_device *dev, int i);
|
static void dump_rx_desc(int dbg_lvl, struct net_device *dev, int i);
|
||||||
static void dump_skb(int dbg_lvl, struct net_device *dev,
|
static void dump_skb(int dbg_lvl, struct net_device *dev,
|
||||||
struct sk_buff *skb);
|
struct sk_buff *skb);
|
||||||
static void dump_hw_addr(int dbg_lvl, struct net_device *dev,
|
|
||||||
const char* pfx, unsigned char* addr_str);
|
|
||||||
static void update_stats(struct gt96100_private *gp);
|
static void update_stats(struct gt96100_private *gp);
|
||||||
static void abort(struct net_device *dev, u32 abort_bits);
|
static void abort(struct net_device *dev, u32 abort_bits);
|
||||||
static void hard_stop(struct net_device *dev);
|
static void hard_stop(struct net_device *dev);
|
||||||
|
@ -334,13 +332,13 @@ dump_MII(int dbg_lvl, struct net_device *dev)
|
||||||
|
|
||||||
static void
|
static void
|
||||||
dump_hw_addr(int dbg_lvl, struct net_device *dev, const char* pfx,
|
dump_hw_addr(int dbg_lvl, struct net_device *dev, const char* pfx,
|
||||||
unsigned char* addr_str)
|
const char* func, unsigned char* addr_str)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
char buf[100], octet[5];
|
char buf[100], octet[5];
|
||||||
|
|
||||||
if (dbg_lvl <= GT96100_DEBUG) {
|
if (dbg_lvl <= GT96100_DEBUG) {
|
||||||
strcpy(buf, pfx);
|
sprintf(buf, pfx, func);
|
||||||
for (i = 0; i < 6; i++) {
|
for (i = 0; i < 6; i++) {
|
||||||
sprintf(octet, "%2.2x%s",
|
sprintf(octet, "%2.2x%s",
|
||||||
addr_str[i], i<5 ? ":" : "\n");
|
addr_str[i], i<5 ? ":" : "\n");
|
||||||
|
@ -708,7 +706,7 @@ static int __init gt96100_probe1(struct pci_dev *pci, int port_num)
|
||||||
|
|
||||||
info("%s found at 0x%x, irq %d\n",
|
info("%s found at 0x%x, irq %d\n",
|
||||||
chip_name(gp->chip_rev), gtif->iobase, gtif->irq);
|
chip_name(gp->chip_rev), gtif->iobase, gtif->irq);
|
||||||
dump_hw_addr(0, dev, "HW Address ", dev->dev_addr);
|
dump_hw_addr(0, dev, "%s: HW Address ", __FUNCTION__, dev->dev_addr);
|
||||||
info("%s chip revision=%d\n", chip_name(gp->chip_rev), gp->chip_rev);
|
info("%s chip revision=%d\n", chip_name(gp->chip_rev), gp->chip_rev);
|
||||||
info("%s ethernet port %d\n", chip_name(gp->chip_rev), gp->port_num);
|
info("%s ethernet port %d\n", chip_name(gp->chip_rev), gp->port_num);
|
||||||
info("external PHY ID1=0x%04x, ID2=0x%04x\n", phy_id1, phy_id2);
|
info("external PHY ID1=0x%04x, ID2=0x%04x\n", phy_id1, phy_id2);
|
||||||
|
@ -1488,7 +1486,7 @@ gt96100_set_rx_mode(struct net_device *dev)
|
||||||
gt96100_add_hash_entry(dev, dev->dev_addr);
|
gt96100_add_hash_entry(dev, dev->dev_addr);
|
||||||
|
|
||||||
for (mcptr = dev->mc_list; mcptr; mcptr = mcptr->next) {
|
for (mcptr = dev->mc_list; mcptr; mcptr = mcptr->next) {
|
||||||
dump_hw_addr(2, dev, __FUNCTION__ ": addr=",
|
dump_hw_addr(2, dev, "%s: addr=", __FUNCTION__,
|
||||||
mcptr->dmi_addr);
|
mcptr->dmi_addr);
|
||||||
gt96100_add_hash_entry(dev, mcptr->dmi_addr);
|
gt96100_add_hash_entry(dev, mcptr->dmi_addr);
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче