diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-04-29 03:59:19 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-29 11:06:03 -0400 |
commit | eecd58536a97502153d4a2bd6f05038f657a1ab3 (patch) | |
tree | a5effaa2f7283f049faba47bc8d576d696e47208 /drivers/firmware/dell_rbu.c | |
parent | 7d195a5409120277b800c42e846ee29cc667b777 (diff) |
firmware: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Cc: Doug Warzecha <Douglas_Warzecha@dell.com>
Cc: Matt Domsch <Matt_Domsch@dell.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/firmware/dell_rbu.c')
-rw-r--r-- | drivers/firmware/dell_rbu.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/firmware/dell_rbu.c b/drivers/firmware/dell_rbu.c index 477a3d0e3caf..6a8b1e037e07 100644 --- a/drivers/firmware/dell_rbu.c +++ b/drivers/firmware/dell_rbu.c | |||
@@ -123,7 +123,7 @@ static int create_packet(void *data, size_t length) | |||
123 | if (!newpacket) { | 123 | if (!newpacket) { |
124 | printk(KERN_WARNING | 124 | printk(KERN_WARNING |
125 | "dell_rbu:%s: failed to allocate new " | 125 | "dell_rbu:%s: failed to allocate new " |
126 | "packet\n", __FUNCTION__); | 126 | "packet\n", __func__); |
127 | retval = -ENOMEM; | 127 | retval = -ENOMEM; |
128 | spin_lock(&rbu_data.lock); | 128 | spin_lock(&rbu_data.lock); |
129 | goto out_noalloc; | 129 | goto out_noalloc; |
@@ -152,7 +152,7 @@ static int create_packet(void *data, size_t length) | |||
152 | printk(KERN_WARNING | 152 | printk(KERN_WARNING |
153 | "dell_rbu:%s: failed to allocate " | 153 | "dell_rbu:%s: failed to allocate " |
154 | "invalid_addr_packet_array \n", | 154 | "invalid_addr_packet_array \n", |
155 | __FUNCTION__); | 155 | __func__); |
156 | retval = -ENOMEM; | 156 | retval = -ENOMEM; |
157 | spin_lock(&rbu_data.lock); | 157 | spin_lock(&rbu_data.lock); |
158 | goto out_alloc_packet; | 158 | goto out_alloc_packet; |
@@ -164,7 +164,7 @@ static int create_packet(void *data, size_t length) | |||
164 | if (!packet_data_temp_buf) { | 164 | if (!packet_data_temp_buf) { |
165 | printk(KERN_WARNING | 165 | printk(KERN_WARNING |
166 | "dell_rbu:%s: failed to allocate new " | 166 | "dell_rbu:%s: failed to allocate new " |
167 | "packet\n", __FUNCTION__); | 167 | "packet\n", __func__); |
168 | retval = -ENOMEM; | 168 | retval = -ENOMEM; |
169 | spin_lock(&rbu_data.lock); | 169 | spin_lock(&rbu_data.lock); |
170 | goto out_alloc_packet_array; | 170 | goto out_alloc_packet_array; |
@@ -416,7 +416,7 @@ static int img_update_realloc(unsigned long size) | |||
416 | */ | 416 | */ |
417 | if ((size != 0) && (rbu_data.image_update_buffer == NULL)) { | 417 | if ((size != 0) && (rbu_data.image_update_buffer == NULL)) { |
418 | printk(KERN_ERR "dell_rbu:%s: corruption " | 418 | printk(KERN_ERR "dell_rbu:%s: corruption " |
419 | "check failed\n", __FUNCTION__); | 419 | "check failed\n", __func__); |
420 | return -EINVAL; | 420 | return -EINVAL; |
421 | } | 421 | } |
422 | /* | 422 | /* |
@@ -642,7 +642,7 @@ static ssize_t write_rbu_image_type(struct kobject *kobj, | |||
642 | if (req_firm_rc) { | 642 | if (req_firm_rc) { |
643 | printk(KERN_ERR | 643 | printk(KERN_ERR |
644 | "dell_rbu:%s request_firmware_nowait" | 644 | "dell_rbu:%s request_firmware_nowait" |
645 | " failed %d\n", __FUNCTION__, rc); | 645 | " failed %d\n", __func__, rc); |
646 | rc = -EIO; | 646 | rc = -EIO; |
647 | } else | 647 | } else |
648 | rbu_data.entry_created = 1; | 648 | rbu_data.entry_created = 1; |
@@ -718,7 +718,7 @@ static int __init dcdrbu_init(void) | |||
718 | if (IS_ERR(rbu_device)) { | 718 | if (IS_ERR(rbu_device)) { |
719 | printk(KERN_ERR | 719 | printk(KERN_ERR |
720 | "dell_rbu:%s:platform_device_register_simple " | 720 | "dell_rbu:%s:platform_device_register_simple " |
721 | "failed\n", __FUNCTION__); | 721 | "failed\n", __func__); |
722 | return PTR_ERR(rbu_device); | 722 | return PTR_ERR(rbu_device); |
723 | } | 723 | } |
724 | 724 | ||