diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-04-29 03:59:20 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-29 11:06:03 -0400 |
commit | 6e574195b75543bc6a6240306313988b1952470c (patch) | |
tree | 510fb98e64cee409cf1f443391cadb5dc1e53aa3 /drivers/misc/ioc4.c | |
parent | eecd58536a97502153d4a2bd6f05038f657a1ab3 (diff) |
drivers/misc: replace remaining __FUNCTION__ occurrences
__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: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/misc/ioc4.c')
-rw-r--r-- | drivers/misc/ioc4.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/misc/ioc4.c b/drivers/misc/ioc4.c index 05172d2613d6..6f76573e7c8a 100644 --- a/drivers/misc/ioc4.c +++ b/drivers/misc/ioc4.c | |||
@@ -75,7 +75,7 @@ ioc4_register_submodule(struct ioc4_submodule *is) | |||
75 | printk(KERN_WARNING | 75 | printk(KERN_WARNING |
76 | "%s: IOC4 submodule %s probe failed " | 76 | "%s: IOC4 submodule %s probe failed " |
77 | "for pci_dev %s", | 77 | "for pci_dev %s", |
78 | __FUNCTION__, module_name(is->is_owner), | 78 | __func__, module_name(is->is_owner), |
79 | pci_name(idd->idd_pdev)); | 79 | pci_name(idd->idd_pdev)); |
80 | } | 80 | } |
81 | } | 81 | } |
@@ -102,7 +102,7 @@ ioc4_unregister_submodule(struct ioc4_submodule *is) | |||
102 | printk(KERN_WARNING | 102 | printk(KERN_WARNING |
103 | "%s: IOC4 submodule %s remove failed " | 103 | "%s: IOC4 submodule %s remove failed " |
104 | "for pci_dev %s.\n", | 104 | "for pci_dev %s.\n", |
105 | __FUNCTION__, module_name(is->is_owner), | 105 | __func__, module_name(is->is_owner), |
106 | pci_name(idd->idd_pdev)); | 106 | pci_name(idd->idd_pdev)); |
107 | } | 107 | } |
108 | } | 108 | } |
@@ -282,7 +282,7 @@ ioc4_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id) | |||
282 | if ((ret = pci_enable_device(pdev))) { | 282 | if ((ret = pci_enable_device(pdev))) { |
283 | printk(KERN_WARNING | 283 | printk(KERN_WARNING |
284 | "%s: Failed to enable IOC4 device for pci_dev %s.\n", | 284 | "%s: Failed to enable IOC4 device for pci_dev %s.\n", |
285 | __FUNCTION__, pci_name(pdev)); | 285 | __func__, pci_name(pdev)); |
286 | goto out; | 286 | goto out; |
287 | } | 287 | } |
288 | pci_set_master(pdev); | 288 | pci_set_master(pdev); |
@@ -292,7 +292,7 @@ ioc4_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id) | |||
292 | if (!idd) { | 292 | if (!idd) { |
293 | printk(KERN_WARNING | 293 | printk(KERN_WARNING |
294 | "%s: Failed to allocate IOC4 data for pci_dev %s.\n", | 294 | "%s: Failed to allocate IOC4 data for pci_dev %s.\n", |
295 | __FUNCTION__, pci_name(pdev)); | 295 | __func__, pci_name(pdev)); |
296 | ret = -ENODEV; | 296 | ret = -ENODEV; |
297 | goto out_idd; | 297 | goto out_idd; |
298 | } | 298 | } |
@@ -307,7 +307,7 @@ ioc4_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id) | |||
307 | printk(KERN_WARNING | 307 | printk(KERN_WARNING |
308 | "%s: Unable to find IOC4 misc resource " | 308 | "%s: Unable to find IOC4 misc resource " |
309 | "for pci_dev %s.\n", | 309 | "for pci_dev %s.\n", |
310 | __FUNCTION__, pci_name(idd->idd_pdev)); | 310 | __func__, pci_name(idd->idd_pdev)); |
311 | ret = -ENODEV; | 311 | ret = -ENODEV; |
312 | goto out_pci; | 312 | goto out_pci; |
313 | } | 313 | } |
@@ -316,7 +316,7 @@ ioc4_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id) | |||
316 | printk(KERN_WARNING | 316 | printk(KERN_WARNING |
317 | "%s: Unable to request IOC4 misc region " | 317 | "%s: Unable to request IOC4 misc region " |
318 | "for pci_dev %s.\n", | 318 | "for pci_dev %s.\n", |
319 | __FUNCTION__, pci_name(idd->idd_pdev)); | 319 | __func__, pci_name(idd->idd_pdev)); |
320 | ret = -ENODEV; | 320 | ret = -ENODEV; |
321 | goto out_pci; | 321 | goto out_pci; |
322 | } | 322 | } |
@@ -326,7 +326,7 @@ ioc4_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id) | |||
326 | printk(KERN_WARNING | 326 | printk(KERN_WARNING |
327 | "%s: Unable to remap IOC4 misc region " | 327 | "%s: Unable to remap IOC4 misc region " |
328 | "for pci_dev %s.\n", | 328 | "for pci_dev %s.\n", |
329 | __FUNCTION__, pci_name(idd->idd_pdev)); | 329 | __func__, pci_name(idd->idd_pdev)); |
330 | ret = -ENODEV; | 330 | ret = -ENODEV; |
331 | goto out_misc_region; | 331 | goto out_misc_region; |
332 | } | 332 | } |
@@ -372,7 +372,7 @@ ioc4_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id) | |||
372 | printk(KERN_WARNING | 372 | printk(KERN_WARNING |
373 | "%s: IOC4 submodule 0x%s probe failed " | 373 | "%s: IOC4 submodule 0x%s probe failed " |
374 | "for pci_dev %s.\n", | 374 | "for pci_dev %s.\n", |
375 | __FUNCTION__, module_name(is->is_owner), | 375 | __func__, module_name(is->is_owner), |
376 | pci_name(idd->idd_pdev)); | 376 | pci_name(idd->idd_pdev)); |
377 | } | 377 | } |
378 | } | 378 | } |
@@ -406,7 +406,7 @@ ioc4_remove(struct pci_dev *pdev) | |||
406 | printk(KERN_WARNING | 406 | printk(KERN_WARNING |
407 | "%s: IOC4 submodule 0x%s remove failed " | 407 | "%s: IOC4 submodule 0x%s remove failed " |
408 | "for pci_dev %s.\n", | 408 | "for pci_dev %s.\n", |
409 | __FUNCTION__, module_name(is->is_owner), | 409 | __func__, module_name(is->is_owner), |
410 | pci_name(idd->idd_pdev)); | 410 | pci_name(idd->idd_pdev)); |
411 | } | 411 | } |
412 | } | 412 | } |
@@ -418,7 +418,7 @@ ioc4_remove(struct pci_dev *pdev) | |||
418 | printk(KERN_WARNING | 418 | printk(KERN_WARNING |
419 | "%s: Unable to get IOC4 misc mapping for pci_dev %s. " | 419 | "%s: Unable to get IOC4 misc mapping for pci_dev %s. " |
420 | "Device removal may be incomplete.\n", | 420 | "Device removal may be incomplete.\n", |
421 | __FUNCTION__, pci_name(idd->idd_pdev)); | 421 | __func__, pci_name(idd->idd_pdev)); |
422 | } | 422 | } |
423 | release_mem_region(idd->idd_bar0, sizeof(struct ioc4_misc_regs)); | 423 | release_mem_region(idd->idd_bar0, sizeof(struct ioc4_misc_regs)); |
424 | 424 | ||