aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/firmware/dcdbas.c
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2008-04-29 03:59:19 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-29 11:06:03 -0400
commiteecd58536a97502153d4a2bd6f05038f657a1ab3 (patch)
treea5effaa2f7283f049faba47bc8d576d696e47208 /drivers/firmware/dcdbas.c
parent7d195a5409120277b800c42e846ee29cc667b777 (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/dcdbas.c')
-rw-r--r--drivers/firmware/dcdbas.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/firmware/dcdbas.c b/drivers/firmware/dcdbas.c
index f235940719e7..25918f7dfd0f 100644
--- a/drivers/firmware/dcdbas.c
+++ b/drivers/firmware/dcdbas.c
@@ -63,7 +63,7 @@ static void smi_data_buf_free(void)
63 return; 63 return;
64 64
65 dev_dbg(&dcdbas_pdev->dev, "%s: phys: %x size: %lu\n", 65 dev_dbg(&dcdbas_pdev->dev, "%s: phys: %x size: %lu\n",
66 __FUNCTION__, smi_data_buf_phys_addr, smi_data_buf_size); 66 __func__, smi_data_buf_phys_addr, smi_data_buf_size);
67 67
68 dma_free_coherent(&dcdbas_pdev->dev, smi_data_buf_size, smi_data_buf, 68 dma_free_coherent(&dcdbas_pdev->dev, smi_data_buf_size, smi_data_buf,
69 smi_data_buf_handle); 69 smi_data_buf_handle);
@@ -92,7 +92,7 @@ static int smi_data_buf_realloc(unsigned long size)
92 if (!buf) { 92 if (!buf) {
93 dev_dbg(&dcdbas_pdev->dev, 93 dev_dbg(&dcdbas_pdev->dev,
94 "%s: failed to allocate memory size %lu\n", 94 "%s: failed to allocate memory size %lu\n",
95 __FUNCTION__, size); 95 __func__, size);
96 return -ENOMEM; 96 return -ENOMEM;
97 } 97 }
98 /* memory zeroed by dma_alloc_coherent */ 98 /* memory zeroed by dma_alloc_coherent */
@@ -110,7 +110,7 @@ static int smi_data_buf_realloc(unsigned long size)
110 smi_data_buf_size = size; 110 smi_data_buf_size = size;
111 111
112 dev_dbg(&dcdbas_pdev->dev, "%s: phys: %x size: %lu\n", 112 dev_dbg(&dcdbas_pdev->dev, "%s: phys: %x size: %lu\n",
113 __FUNCTION__, smi_data_buf_phys_addr, smi_data_buf_size); 113 __func__, smi_data_buf_phys_addr, smi_data_buf_size);
114 114
115 return 0; 115 return 0;
116} 116}
@@ -258,7 +258,7 @@ static int smi_request(struct smi_cmd *smi_cmd)
258 258
259 if (smi_cmd->magic != SMI_CMD_MAGIC) { 259 if (smi_cmd->magic != SMI_CMD_MAGIC) {
260 dev_info(&dcdbas_pdev->dev, "%s: invalid magic value\n", 260 dev_info(&dcdbas_pdev->dev, "%s: invalid magic value\n",
261 __FUNCTION__); 261 __func__);
262 return -EBADR; 262 return -EBADR;
263 } 263 }
264 264
@@ -267,7 +267,7 @@ static int smi_request(struct smi_cmd *smi_cmd)
267 set_cpus_allowed_ptr(current, &cpumask_of_cpu(0)); 267 set_cpus_allowed_ptr(current, &cpumask_of_cpu(0));
268 if (smp_processor_id() != 0) { 268 if (smp_processor_id() != 0) {
269 dev_dbg(&dcdbas_pdev->dev, "%s: failed to get CPU 0\n", 269 dev_dbg(&dcdbas_pdev->dev, "%s: failed to get CPU 0\n",
270 __FUNCTION__); 270 __func__);
271 ret = -EBUSY; 271 ret = -EBUSY;
272 goto out; 272 goto out;
273 } 273 }
@@ -428,7 +428,7 @@ static int host_control_smi(void)
428 428
429 default: 429 default:
430 dev_dbg(&dcdbas_pdev->dev, "%s: invalid SMI type %u\n", 430 dev_dbg(&dcdbas_pdev->dev, "%s: invalid SMI type %u\n",
431 __FUNCTION__, host_control_smi_type); 431 __func__, host_control_smi_type);
432 return -ENOSYS; 432 return -ENOSYS;
433 } 433 }
434 434
@@ -456,13 +456,13 @@ static void dcdbas_host_control(void)
456 host_control_action = HC_ACTION_NONE; 456 host_control_action = HC_ACTION_NONE;
457 457
458 if (!smi_data_buf) { 458 if (!smi_data_buf) {
459 dev_dbg(&dcdbas_pdev->dev, "%s: no SMI buffer\n", __FUNCTION__); 459 dev_dbg(&dcdbas_pdev->dev, "%s: no SMI buffer\n", __func__);
460 return; 460 return;
461 } 461 }
462 462
463 if (smi_data_buf_size < sizeof(struct apm_cmd)) { 463 if (smi_data_buf_size < sizeof(struct apm_cmd)) {
464 dev_dbg(&dcdbas_pdev->dev, "%s: SMI buffer too small\n", 464 dev_dbg(&dcdbas_pdev->dev, "%s: SMI buffer too small\n",
465 __FUNCTION__); 465 __func__);
466 return; 466 return;
467 } 467 }
468 468