diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-04-30 03:55:10 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-30 11:29:54 -0400 |
commit | bf9d89295233ae2ba7b312c78ee5657307b09f4c (patch) | |
tree | 3da2fbcd93937bfa1907a893dc0d418c78f3d37b /drivers/char/hpet.c | |
parent | 8e24eea728068bbeb6a3c500b848f883a20bf225 (diff) |
drivers/char: 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/char/hpet.c')
-rw-r--r-- | drivers/char/hpet.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c index 1399971be68..e7fb0bca366 100644 --- a/drivers/char/hpet.c +++ b/drivers/char/hpet.c | |||
@@ -308,7 +308,7 @@ static int hpet_mmap(struct file *file, struct vm_area_struct *vma) | |||
308 | if (io_remap_pfn_range(vma, vma->vm_start, addr >> PAGE_SHIFT, | 308 | if (io_remap_pfn_range(vma, vma->vm_start, addr >> PAGE_SHIFT, |
309 | PAGE_SIZE, vma->vm_page_prot)) { | 309 | PAGE_SIZE, vma->vm_page_prot)) { |
310 | printk(KERN_ERR "%s: io_remap_pfn_range failed\n", | 310 | printk(KERN_ERR "%s: io_remap_pfn_range failed\n", |
311 | __FUNCTION__); | 311 | __func__); |
312 | return -EAGAIN; | 312 | return -EAGAIN; |
313 | } | 313 | } |
314 | 314 | ||
@@ -748,7 +748,7 @@ int hpet_alloc(struct hpet_data *hdp) | |||
748 | */ | 748 | */ |
749 | if (hpet_is_known(hdp)) { | 749 | if (hpet_is_known(hdp)) { |
750 | printk(KERN_DEBUG "%s: duplicate HPET ignored\n", | 750 | printk(KERN_DEBUG "%s: duplicate HPET ignored\n", |
751 | __FUNCTION__); | 751 | __func__); |
752 | return 0; | 752 | return 0; |
753 | } | 753 | } |
754 | 754 | ||
@@ -869,7 +869,7 @@ static acpi_status hpet_resources(struct acpi_resource *res, void *data) | |||
869 | 869 | ||
870 | if (hpet_is_known(hdp)) { | 870 | if (hpet_is_known(hdp)) { |
871 | printk(KERN_DEBUG "%s: 0x%lx is busy\n", | 871 | printk(KERN_DEBUG "%s: 0x%lx is busy\n", |
872 | __FUNCTION__, hdp->hd_phys_address); | 872 | __func__, hdp->hd_phys_address); |
873 | iounmap(hdp->hd_address); | 873 | iounmap(hdp->hd_address); |
874 | return AE_ALREADY_EXISTS; | 874 | return AE_ALREADY_EXISTS; |
875 | } | 875 | } |
@@ -886,7 +886,7 @@ static acpi_status hpet_resources(struct acpi_resource *res, void *data) | |||
886 | 886 | ||
887 | if (hpet_is_known(hdp)) { | 887 | if (hpet_is_known(hdp)) { |
888 | printk(KERN_DEBUG "%s: 0x%lx is busy\n", | 888 | printk(KERN_DEBUG "%s: 0x%lx is busy\n", |
889 | __FUNCTION__, hdp->hd_phys_address); | 889 | __func__, hdp->hd_phys_address); |
890 | iounmap(hdp->hd_address); | 890 | iounmap(hdp->hd_address); |
891 | return AE_ALREADY_EXISTS; | 891 | return AE_ALREADY_EXISTS; |
892 | } | 892 | } |
@@ -925,7 +925,7 @@ static int hpet_acpi_add(struct acpi_device *device) | |||
925 | return -ENODEV; | 925 | return -ENODEV; |
926 | 926 | ||
927 | if (!data.hd_address || !data.hd_nirqs) { | 927 | if (!data.hd_address || !data.hd_nirqs) { |
928 | printk("%s: no address or irqs in _CRS\n", __FUNCTION__); | 928 | printk("%s: no address or irqs in _CRS\n", __func__); |
929 | return -ENODEV; | 929 | return -ENODEV; |
930 | } | 930 | } |
931 | 931 | ||