Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 560c22fe1fc8b3523ef422da4f1cf04aa22d1471

Authored by Ralf Baechle
Committed by Jeff Garzik
1 parent 5579345546
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

[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>

Showing 1 changed file with 4 additions and 6 deletions Side-by-side Diff

drivers/net/gt96100eth.c
Diff comments   View file @ 560c22f
... ... @@ -72,8 +72,6 @@
72 72 static void dump_rx_desc(int dbg_lvl, struct net_device *dev, int i);
73 73 static void dump_skb(int dbg_lvl, struct net_device *dev,
74 74 struct sk_buff *skb);
75   -static void dump_hw_addr(int dbg_lvl, struct net_device *dev,
76   - const char* pfx, unsigned char* addr_str);
77 75 static void update_stats(struct gt96100_private *gp);
78 76 static void abort(struct net_device *dev, u32 abort_bits);
79 77 static void hard_stop(struct net_device *dev);
80 78  
... ... @@ -334,13 +332,13 @@
334 332  
335 333 static void
336 334 dump_hw_addr(int dbg_lvl, struct net_device *dev, const char* pfx,
337   - unsigned char* addr_str)
  335 + const char* func, unsigned char* addr_str)
338 336 {
339 337 int i;
340 338 char buf[100], octet[5];
341 339  
342 340 if (dbg_lvl <= GT96100_DEBUG) {
343   - strcpy(buf, pfx);
  341 + sprintf(buf, pfx, func);
344 342 for (i = 0; i < 6; i++) {
345 343 sprintf(octet, "%2.2x%s",
346 344 addr_str[i], i<5 ? ":" : "\n");
... ... @@ -708,7 +706,7 @@
708 706  
709 707 info("%s found at 0x%x, irq %d\n",
710 708 chip_name(gp->chip_rev), gtif->iobase, gtif->irq);
711   - dump_hw_addr(0, dev, "HW Address ", dev->dev_addr);
  709 + dump_hw_addr(0, dev, "%s: HW Address ", __FUNCTION__, dev->dev_addr);
712 710 info("%s chip revision=%d\n", chip_name(gp->chip_rev), gp->chip_rev);
713 711 info("%s ethernet port %d\n", chip_name(gp->chip_rev), gp->port_num);
714 712 info("external PHY ID1=0x%04x, ID2=0x%04x\n", phy_id1, phy_id2);
... ... @@ -1488,7 +1486,7 @@
1488 1486 gt96100_add_hash_entry(dev, dev->dev_addr);
1489 1487  
1490 1488 for (mcptr = dev->mc_list; mcptr; mcptr = mcptr->next) {
1491   - dump_hw_addr(2, dev, __FUNCTION__ ": addr=",
  1489 + dump_hw_addr(2, dev, "%s: addr=", __FUNCTION__,
1492 1490 mcptr->dmi_addr);
1493 1491 gt96100_add_hash_entry(dev, mcptr->dmi_addr);
1494 1492 }