mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-28 06:34:12 +08:00
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>
This commit is contained in:
parent
7d195a5409
commit
eecd58536a
@ -63,7 +63,7 @@ static void smi_data_buf_free(void)
|
||||
return;
|
||||
|
||||
dev_dbg(&dcdbas_pdev->dev, "%s: phys: %x size: %lu\n",
|
||||
__FUNCTION__, smi_data_buf_phys_addr, smi_data_buf_size);
|
||||
__func__, smi_data_buf_phys_addr, smi_data_buf_size);
|
||||
|
||||
dma_free_coherent(&dcdbas_pdev->dev, smi_data_buf_size, smi_data_buf,
|
||||
smi_data_buf_handle);
|
||||
@ -92,7 +92,7 @@ static int smi_data_buf_realloc(unsigned long size)
|
||||
if (!buf) {
|
||||
dev_dbg(&dcdbas_pdev->dev,
|
||||
"%s: failed to allocate memory size %lu\n",
|
||||
__FUNCTION__, size);
|
||||
__func__, size);
|
||||
return -ENOMEM;
|
||||
}
|
||||
/* memory zeroed by dma_alloc_coherent */
|
||||
@ -110,7 +110,7 @@ static int smi_data_buf_realloc(unsigned long size)
|
||||
smi_data_buf_size = size;
|
||||
|
||||
dev_dbg(&dcdbas_pdev->dev, "%s: phys: %x size: %lu\n",
|
||||
__FUNCTION__, smi_data_buf_phys_addr, smi_data_buf_size);
|
||||
__func__, smi_data_buf_phys_addr, smi_data_buf_size);
|
||||
|
||||
return 0;
|
||||
}
|
||||
@ -258,7 +258,7 @@ static int smi_request(struct smi_cmd *smi_cmd)
|
||||
|
||||
if (smi_cmd->magic != SMI_CMD_MAGIC) {
|
||||
dev_info(&dcdbas_pdev->dev, "%s: invalid magic value\n",
|
||||
__FUNCTION__);
|
||||
__func__);
|
||||
return -EBADR;
|
||||
}
|
||||
|
||||
@ -267,7 +267,7 @@ static int smi_request(struct smi_cmd *smi_cmd)
|
||||
set_cpus_allowed_ptr(current, &cpumask_of_cpu(0));
|
||||
if (smp_processor_id() != 0) {
|
||||
dev_dbg(&dcdbas_pdev->dev, "%s: failed to get CPU 0\n",
|
||||
__FUNCTION__);
|
||||
__func__);
|
||||
ret = -EBUSY;
|
||||
goto out;
|
||||
}
|
||||
@ -428,7 +428,7 @@ static int host_control_smi(void)
|
||||
|
||||
default:
|
||||
dev_dbg(&dcdbas_pdev->dev, "%s: invalid SMI type %u\n",
|
||||
__FUNCTION__, host_control_smi_type);
|
||||
__func__, host_control_smi_type);
|
||||
return -ENOSYS;
|
||||
}
|
||||
|
||||
@ -456,13 +456,13 @@ static void dcdbas_host_control(void)
|
||||
host_control_action = HC_ACTION_NONE;
|
||||
|
||||
if (!smi_data_buf) {
|
||||
dev_dbg(&dcdbas_pdev->dev, "%s: no SMI buffer\n", __FUNCTION__);
|
||||
dev_dbg(&dcdbas_pdev->dev, "%s: no SMI buffer\n", __func__);
|
||||
return;
|
||||
}
|
||||
|
||||
if (smi_data_buf_size < sizeof(struct apm_cmd)) {
|
||||
dev_dbg(&dcdbas_pdev->dev, "%s: SMI buffer too small\n",
|
||||
__FUNCTION__);
|
||||
__func__);
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -123,7 +123,7 @@ static int create_packet(void *data, size_t length)
|
||||
if (!newpacket) {
|
||||
printk(KERN_WARNING
|
||||
"dell_rbu:%s: failed to allocate new "
|
||||
"packet\n", __FUNCTION__);
|
||||
"packet\n", __func__);
|
||||
retval = -ENOMEM;
|
||||
spin_lock(&rbu_data.lock);
|
||||
goto out_noalloc;
|
||||
@ -152,7 +152,7 @@ static int create_packet(void *data, size_t length)
|
||||
printk(KERN_WARNING
|
||||
"dell_rbu:%s: failed to allocate "
|
||||
"invalid_addr_packet_array \n",
|
||||
__FUNCTION__);
|
||||
__func__);
|
||||
retval = -ENOMEM;
|
||||
spin_lock(&rbu_data.lock);
|
||||
goto out_alloc_packet;
|
||||
@ -164,7 +164,7 @@ static int create_packet(void *data, size_t length)
|
||||
if (!packet_data_temp_buf) {
|
||||
printk(KERN_WARNING
|
||||
"dell_rbu:%s: failed to allocate new "
|
||||
"packet\n", __FUNCTION__);
|
||||
"packet\n", __func__);
|
||||
retval = -ENOMEM;
|
||||
spin_lock(&rbu_data.lock);
|
||||
goto out_alloc_packet_array;
|
||||
@ -416,7 +416,7 @@ static int img_update_realloc(unsigned long size)
|
||||
*/
|
||||
if ((size != 0) && (rbu_data.image_update_buffer == NULL)) {
|
||||
printk(KERN_ERR "dell_rbu:%s: corruption "
|
||||
"check failed\n", __FUNCTION__);
|
||||
"check failed\n", __func__);
|
||||
return -EINVAL;
|
||||
}
|
||||
/*
|
||||
@ -642,7 +642,7 @@ static ssize_t write_rbu_image_type(struct kobject *kobj,
|
||||
if (req_firm_rc) {
|
||||
printk(KERN_ERR
|
||||
"dell_rbu:%s request_firmware_nowait"
|
||||
" failed %d\n", __FUNCTION__, rc);
|
||||
" failed %d\n", __func__, rc);
|
||||
rc = -EIO;
|
||||
} else
|
||||
rbu_data.entry_created = 1;
|
||||
@ -718,7 +718,7 @@ static int __init dcdrbu_init(void)
|
||||
if (IS_ERR(rbu_device)) {
|
||||
printk(KERN_ERR
|
||||
"dell_rbu:%s:platform_device_register_simple "
|
||||
"failed\n", __FUNCTION__);
|
||||
"failed\n", __func__);
|
||||
return PTR_ERR(rbu_device);
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user