aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/base/firmware_class.c
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2008-03-04 19:41:05 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2008-04-19 22:10:29 -0400
commit2b3a302a09735276e13421db56c20045a48eb06d (patch)
tree77af4f2f378d92d7b61727a38501feed3365e57f /drivers/base/firmware_class.c
parent2424b5dd062cbe3e0578ae7b11a1b360ad22f451 (diff)
driver core: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__ Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/base/firmware_class.c')
-rw-r--r--drivers/base/firmware_class.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index 4a1b9bfc5471..1fef7df8c9d6 100644
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
@@ -156,7 +156,7 @@ static ssize_t firmware_loading_store(struct device *dev,
156 } 156 }
157 /* fallthrough */ 157 /* fallthrough */
158 default: 158 default:
159 printk(KERN_ERR "%s: unexpected value (%d)\n", __FUNCTION__, 159 printk(KERN_ERR "%s: unexpected value (%d)\n", __func__,
160 loading); 160 loading);
161 /* fallthrough */ 161 /* fallthrough */
162 case -1: 162 case -1:
@@ -209,7 +209,7 @@ fw_realloc_buffer(struct firmware_priv *fw_priv, int min_size)
209 new_size = ALIGN(min_size, PAGE_SIZE); 209 new_size = ALIGN(min_size, PAGE_SIZE);
210 new_data = vmalloc(new_size); 210 new_data = vmalloc(new_size);
211 if (!new_data) { 211 if (!new_data) {
212 printk(KERN_ERR "%s: unable to alloc buffer\n", __FUNCTION__); 212 printk(KERN_ERR "%s: unable to alloc buffer\n", __func__);
213 /* Make sure that we don't keep incomplete data */ 213 /* Make sure that we don't keep incomplete data */
214 fw_load_abort(fw_priv); 214 fw_load_abort(fw_priv);
215 return -ENOMEM; 215 return -ENOMEM;
@@ -307,7 +307,7 @@ static int fw_register_device(struct device **dev_p, const char *fw_name,
307 *dev_p = NULL; 307 *dev_p = NULL;
308 308
309 if (!fw_priv || !f_dev) { 309 if (!fw_priv || !f_dev) {
310 printk(KERN_ERR "%s: kmalloc failed\n", __FUNCTION__); 310 printk(KERN_ERR "%s: kmalloc failed\n", __func__);
311 retval = -ENOMEM; 311 retval = -ENOMEM;
312 goto error_kfree; 312 goto error_kfree;
313 } 313 }
@@ -328,7 +328,7 @@ static int fw_register_device(struct device **dev_p, const char *fw_name,
328 retval = device_register(f_dev); 328 retval = device_register(f_dev);
329 if (retval) { 329 if (retval) {
330 printk(KERN_ERR "%s: device_register failed\n", 330 printk(KERN_ERR "%s: device_register failed\n",
331 __FUNCTION__); 331 __func__);
332 goto error_kfree; 332 goto error_kfree;
333 } 333 }
334 *dev_p = f_dev; 334 *dev_p = f_dev;
@@ -362,14 +362,14 @@ static int fw_setup_device(struct firmware *fw, struct device **dev_p,
362 retval = sysfs_create_bin_file(&f_dev->kobj, &fw_priv->attr_data); 362 retval = sysfs_create_bin_file(&f_dev->kobj, &fw_priv->attr_data);
363 if (retval) { 363 if (retval) {
364 printk(KERN_ERR "%s: sysfs_create_bin_file failed\n", 364 printk(KERN_ERR "%s: sysfs_create_bin_file failed\n",
365 __FUNCTION__); 365 __func__);
366 goto error_unreg; 366 goto error_unreg;
367 } 367 }
368 368
369 retval = device_create_file(f_dev, &dev_attr_loading); 369 retval = device_create_file(f_dev, &dev_attr_loading);
370 if (retval) { 370 if (retval) {
371 printk(KERN_ERR "%s: device_create_file failed\n", 371 printk(KERN_ERR "%s: device_create_file failed\n",
372 __FUNCTION__); 372 __func__);
373 goto error_unreg; 373 goto error_unreg;
374 } 374 }
375 375
@@ -399,7 +399,7 @@ _request_firmware(const struct firmware **firmware_p, const char *name,
399 *firmware_p = firmware = kzalloc(sizeof(*firmware), GFP_KERNEL); 399 *firmware_p = firmware = kzalloc(sizeof(*firmware), GFP_KERNEL);
400 if (!firmware) { 400 if (!firmware) {
401 printk(KERN_ERR "%s: kmalloc(struct firmware) failed\n", 401 printk(KERN_ERR "%s: kmalloc(struct firmware) failed\n",
402 __FUNCTION__); 402 __func__);
403 retval = -ENOMEM; 403 retval = -ENOMEM;
404 goto out; 404 goto out;
405 } 405 }
@@ -570,13 +570,13 @@ firmware_class_init(void)
570 int error; 570 int error;
571 error = class_register(&firmware_class); 571 error = class_register(&firmware_class);
572 if (error) { 572 if (error) {
573 printk(KERN_ERR "%s: class_register failed\n", __FUNCTION__); 573 printk(KERN_ERR "%s: class_register failed\n", __func__);
574 return error; 574 return error;
575 } 575 }
576 error = class_create_file(&firmware_class, &class_attr_timeout); 576 error = class_create_file(&firmware_class, &class_attr_timeout);
577 if (error) { 577 if (error) {
578 printk(KERN_ERR "%s: class_create_file failed\n", 578 printk(KERN_ERR "%s: class_create_file failed\n",
579 __FUNCTION__); 579 __func__);
580 class_unregister(&firmware_class); 580 class_unregister(&firmware_class);
581 } 581 }
582 return error; 582 return error;