tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

ioc3.c: replace remaining __FUNCTION__ occurrences

__FUNCTION__ is gcc-specific, use __func__

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

drivers/sn/ioc3.c | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
Signed-off-by: Jeff Garzik <jeff@garzik.org>

authored by

Harvey Harrison and committed by
Jeff Garzik 9150c979 ffea31ed

+11 -11
+11 -11
drivers/sn/ioc3.c
··· 561 561 printk(KERN_WARNING 562 562 "%s: IOC3 submodule %s remove failed " 563 563 "for pci_dev %s.\n", 564 - __FUNCTION__, module_name(is->owner), 564 + __func__, module_name(is->owner), 565 565 pci_name(idd->pdev)); 566 566 idd->active[is->id] = 0; 567 567 if(is->irq_mask) ··· 611 611 if ((ret = pci_enable_device(pdev))) { 612 612 printk(KERN_WARNING 613 613 "%s: Failed to enable IOC3 device for pci_dev %s.\n", 614 - __FUNCTION__, pci_name(pdev)); 614 + __func__, pci_name(pdev)); 615 615 goto out; 616 616 } 617 617 pci_set_master(pdev); ··· 623 623 if (ret < 0) { 624 624 printk(KERN_WARNING "%s: Unable to obtain 64 bit DMA " 625 625 "for consistent allocations\n", 626 - __FUNCTION__); 626 + __func__); 627 627 } 628 628 } 629 629 #endif ··· 633 633 if (!idd) { 634 634 printk(KERN_WARNING 635 635 "%s: Failed to allocate IOC3 data for pci_dev %s.\n", 636 - __FUNCTION__, pci_name(pdev)); 636 + __func__, pci_name(pdev)); 637 637 ret = -ENODEV; 638 638 goto out_idd; 639 639 } ··· 649 649 printk(KERN_WARNING 650 650 "%s: Unable to find IOC3 resource " 651 651 "for pci_dev %s.\n", 652 - __FUNCTION__, pci_name(pdev)); 652 + __func__, pci_name(pdev)); 653 653 ret = -ENODEV; 654 654 goto out_pci; 655 655 } ··· 657 657 printk(KERN_WARNING 658 658 "%s: Unable to request IOC3 region " 659 659 "for pci_dev %s.\n", 660 - __FUNCTION__, pci_name(pdev)); 660 + __func__, pci_name(pdev)); 661 661 ret = -ENODEV; 662 662 goto out_pci; 663 663 } ··· 666 666 printk(KERN_WARNING 667 667 "%s: Unable to remap IOC3 region " 668 668 "for pci_dev %s.\n", 669 - __FUNCTION__, pci_name(pdev)); 669 + __func__, pci_name(pdev)); 670 670 ret = -ENODEV; 671 671 goto out_misc_region; 672 672 } ··· 709 709 } else { 710 710 printk(KERN_WARNING 711 711 "%s : request_irq fails for IRQ 0x%x\n ", 712 - __FUNCTION__, pdev->irq); 712 + __func__, pdev->irq); 713 713 } 714 714 if (!request_irq(pdev->irq+2, ioc3_intr_io, IRQF_SHARED, 715 715 "ioc3-io", (void *)idd)) { ··· 717 717 } else { 718 718 printk(KERN_WARNING 719 719 "%s : request_irq fails for IRQ 0x%x\n ", 720 - __FUNCTION__, pdev->irq+2); 720 + __func__, pdev->irq+2); 721 721 } 722 722 } else { 723 723 if (!request_irq(pdev->irq, ioc3_intr_io, IRQF_SHARED, ··· 726 726 } else { 727 727 printk(KERN_WARNING 728 728 "%s : request_irq fails for IRQ 0x%x\n ", 729 - __FUNCTION__, pdev->irq); 729 + __func__, pdev->irq); 730 730 } 731 731 } 732 732 ··· 769 769 printk(KERN_WARNING 770 770 "%s: IOC3 submodule 0x%s remove failed " 771 771 "for pci_dev %s.\n", 772 - __FUNCTION__, 772 + __func__, 773 773 module_name(ioc3_submodules[id]->owner), 774 774 pci_name(pdev)); 775 775 idd->active[id] = 0;