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/wan/cycx_drv.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/wan/cycx_drv.c')
-rw-r--r-- | drivers/net/wan/cycx_drv.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wan/cycx_drv.c b/drivers/net/wan/cycx_drv.c index d14e6678deed..a5ddc6c8963e 100644 --- a/drivers/net/wan/cycx_drv.c +++ b/drivers/net/wan/cycx_drv.c | |||
@@ -407,7 +407,7 @@ static int load_cyc2x(struct cycx_hw *hw, struct cycx_firmware *cfm, u32 len) | |||
407 | if (cfm->version != CFM_VERSION) { | 407 | if (cfm->version != CFM_VERSION) { |
408 | printk(KERN_ERR "%s:%s: firmware format %u rejected! " | 408 | printk(KERN_ERR "%s:%s: firmware format %u rejected! " |
409 | "Expecting %u.\n", | 409 | "Expecting %u.\n", |
410 | modname, __FUNCTION__, cfm->version, CFM_VERSION); | 410 | modname, __func__, cfm->version, CFM_VERSION); |
411 | return -EINVAL; | 411 | return -EINVAL; |
412 | } | 412 | } |
413 | 413 | ||
@@ -420,7 +420,7 @@ static int load_cyc2x(struct cycx_hw *hw, struct cycx_firmware *cfm, u32 len) | |||
420 | */ | 420 | */ |
421 | if (cksum != cfm->checksum) { | 421 | if (cksum != cfm->checksum) { |
422 | printk(KERN_ERR "%s:%s: firmware corrupted!\n", | 422 | printk(KERN_ERR "%s:%s: firmware corrupted!\n", |
423 | modname, __FUNCTION__); | 423 | modname, __func__); |
424 | printk(KERN_ERR " cdsize = 0x%x (expected 0x%lx)\n", | 424 | printk(KERN_ERR " cdsize = 0x%x (expected 0x%lx)\n", |
425 | len - (int)sizeof(struct cycx_firmware) - 1, | 425 | len - (int)sizeof(struct cycx_firmware) - 1, |
426 | cfm->info.codesize); | 426 | cfm->info.codesize); |
@@ -432,7 +432,7 @@ static int load_cyc2x(struct cycx_hw *hw, struct cycx_firmware *cfm, u32 len) | |||
432 | /* If everything is ok, set reset, data and code pointers */ | 432 | /* If everything is ok, set reset, data and code pointers */ |
433 | img_hdr = (struct cycx_fw_header *)&cfm->image; | 433 | img_hdr = (struct cycx_fw_header *)&cfm->image; |
434 | #ifdef FIRMWARE_DEBUG | 434 | #ifdef FIRMWARE_DEBUG |
435 | printk(KERN_INFO "%s:%s: image sizes\n", __FUNCTION__, modname); | 435 | printk(KERN_INFO "%s:%s: image sizes\n", __func__, modname); |
436 | printk(KERN_INFO " reset=%lu\n", img_hdr->reset_size); | 436 | printk(KERN_INFO " reset=%lu\n", img_hdr->reset_size); |
437 | printk(KERN_INFO " data=%lu\n", img_hdr->data_size); | 437 | printk(KERN_INFO " data=%lu\n", img_hdr->data_size); |
438 | printk(KERN_INFO " code=%lu\n", img_hdr->code_size); | 438 | printk(KERN_INFO " code=%lu\n", img_hdr->code_size); |