diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-08-20 19:52:04 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2008-09-24 18:59:00 -0400 |
commit | b39d66a81fb4f5ab555f86a2e49f3714f8369a3d (patch) | |
tree | 20ffb096fe2781545ac3f77f07ebbb347234e111 /drivers/net/ax88796.c | |
parent | b514f6b6da3aedcf4eb6f0c69e910ae89ef4632f (diff) |
drivers/net: replace __FUNCTION__ with __func__
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net/ax88796.c')
-rw-r--r-- | drivers/net/ax88796.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/ax88796.c b/drivers/net/ax88796.c index a886a4b9f7e5..4207d6efddc0 100644 --- a/drivers/net/ax88796.c +++ b/drivers/net/ax88796.c | |||
@@ -153,7 +153,7 @@ static void ax_reset_8390(struct net_device *dev) | |||
153 | while ((ei_inb(addr + EN0_ISR) & ENISR_RESET) == 0) { | 153 | while ((ei_inb(addr + EN0_ISR) & ENISR_RESET) == 0) { |
154 | if (jiffies - reset_start_time > 2*HZ/100) { | 154 | if (jiffies - reset_start_time > 2*HZ/100) { |
155 | dev_warn(&ax->dev->dev, "%s: %s did not complete.\n", | 155 | dev_warn(&ax->dev->dev, "%s: %s did not complete.\n", |
156 | __FUNCTION__, dev->name); | 156 | __func__, dev->name); |
157 | break; | 157 | break; |
158 | } | 158 | } |
159 | } | 159 | } |
@@ -173,7 +173,7 @@ static void ax_get_8390_hdr(struct net_device *dev, struct e8390_pkt_hdr *hdr, | |||
173 | if (ei_status.dmaing) { | 173 | if (ei_status.dmaing) { |
174 | dev_err(&ax->dev->dev, "%s: DMAing conflict in %s " | 174 | dev_err(&ax->dev->dev, "%s: DMAing conflict in %s " |
175 | "[DMAstat:%d][irqlock:%d].\n", | 175 | "[DMAstat:%d][irqlock:%d].\n", |
176 | dev->name, __FUNCTION__, | 176 | dev->name, __func__, |
177 | ei_status.dmaing, ei_status.irqlock); | 177 | ei_status.dmaing, ei_status.irqlock); |
178 | return; | 178 | return; |
179 | } | 179 | } |
@@ -215,7 +215,7 @@ static void ax_block_input(struct net_device *dev, int count, | |||
215 | dev_err(&ax->dev->dev, | 215 | dev_err(&ax->dev->dev, |
216 | "%s: DMAing conflict in %s " | 216 | "%s: DMAing conflict in %s " |
217 | "[DMAstat:%d][irqlock:%d].\n", | 217 | "[DMAstat:%d][irqlock:%d].\n", |
218 | dev->name, __FUNCTION__, | 218 | dev->name, __func__, |
219 | ei_status.dmaing, ei_status.irqlock); | 219 | ei_status.dmaing, ei_status.irqlock); |
220 | return; | 220 | return; |
221 | } | 221 | } |
@@ -260,7 +260,7 @@ static void ax_block_output(struct net_device *dev, int count, | |||
260 | if (ei_status.dmaing) { | 260 | if (ei_status.dmaing) { |
261 | dev_err(&ax->dev->dev, "%s: DMAing conflict in %s." | 261 | dev_err(&ax->dev->dev, "%s: DMAing conflict in %s." |
262 | "[DMAstat:%d][irqlock:%d]\n", | 262 | "[DMAstat:%d][irqlock:%d]\n", |
263 | dev->name, __FUNCTION__, | 263 | dev->name, __func__, |
264 | ei_status.dmaing, ei_status.irqlock); | 264 | ei_status.dmaing, ei_status.irqlock); |
265 | return; | 265 | return; |
266 | } | 266 | } |
@@ -396,7 +396,7 @@ ax_phy_issueaddr(struct net_device *dev, int phy_addr, int reg, int opc) | |||
396 | { | 396 | { |
397 | if (phy_debug) | 397 | if (phy_debug) |
398 | pr_debug("%s: dev %p, %04x, %04x, %d\n", | 398 | pr_debug("%s: dev %p, %04x, %04x, %d\n", |
399 | __FUNCTION__, dev, phy_addr, reg, opc); | 399 | __func__, dev, phy_addr, reg, opc); |
400 | 400 | ||
401 | ax_mii_ei_outbits(dev, 0x3f, 6); /* pre-amble */ | 401 | ax_mii_ei_outbits(dev, 0x3f, 6); /* pre-amble */ |
402 | ax_mii_ei_outbits(dev, 1, 2); /* frame-start */ | 402 | ax_mii_ei_outbits(dev, 1, 2); /* frame-start */ |
@@ -422,7 +422,7 @@ ax_phy_read(struct net_device *dev, int phy_addr, int reg) | |||
422 | spin_unlock_irqrestore(&ei_local->page_lock, flags); | 422 | spin_unlock_irqrestore(&ei_local->page_lock, flags); |
423 | 423 | ||
424 | if (phy_debug) | 424 | if (phy_debug) |
425 | pr_debug("%s: %04x.%04x => read %04x\n", __FUNCTION__, | 425 | pr_debug("%s: %04x.%04x => read %04x\n", __func__, |
426 | phy_addr, reg, result); | 426 | phy_addr, reg, result); |
427 | 427 | ||
428 | return result; | 428 | return result; |
@@ -436,7 +436,7 @@ ax_phy_write(struct net_device *dev, int phy_addr, int reg, int value) | |||
436 | unsigned long flags; | 436 | unsigned long flags; |
437 | 437 | ||
438 | dev_dbg(&ax->dev->dev, "%s: %p, %04x, %04x %04x\n", | 438 | dev_dbg(&ax->dev->dev, "%s: %p, %04x, %04x %04x\n", |
439 | __FUNCTION__, dev, phy_addr, reg, value); | 439 | __func__, dev, phy_addr, reg, value); |
440 | 440 | ||
441 | spin_lock_irqsave(&ei->page_lock, flags); | 441 | spin_lock_irqsave(&ei->page_lock, flags); |
442 | 442 | ||