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/snsc.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/snsc.c')
-rw-r--r-- | drivers/char/snsc.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/char/snsc.c b/drivers/char/snsc.c index b9c1dba6bd01..8fe099a41065 100644 --- a/drivers/char/snsc.c +++ b/drivers/char/snsc.c | |||
@@ -80,7 +80,7 @@ scdrv_open(struct inode *inode, struct file *file) | |||
80 | sd = kzalloc(sizeof (struct subch_data_s), GFP_KERNEL); | 80 | sd = kzalloc(sizeof (struct subch_data_s), GFP_KERNEL); |
81 | if (sd == NULL) { | 81 | if (sd == NULL) { |
82 | printk("%s: couldn't allocate subchannel data\n", | 82 | printk("%s: couldn't allocate subchannel data\n", |
83 | __FUNCTION__); | 83 | __func__); |
84 | return -ENOMEM; | 84 | return -ENOMEM; |
85 | } | 85 | } |
86 | 86 | ||
@@ -90,7 +90,7 @@ scdrv_open(struct inode *inode, struct file *file) | |||
90 | 90 | ||
91 | if (sd->sd_subch < 0) { | 91 | if (sd->sd_subch < 0) { |
92 | kfree(sd); | 92 | kfree(sd); |
93 | printk("%s: couldn't allocate subchannel\n", __FUNCTION__); | 93 | printk("%s: couldn't allocate subchannel\n", __func__); |
94 | return -EBUSY; | 94 | return -EBUSY; |
95 | } | 95 | } |
96 | 96 | ||
@@ -110,7 +110,7 @@ scdrv_open(struct inode *inode, struct file *file) | |||
110 | if (rv) { | 110 | if (rv) { |
111 | ia64_sn_irtr_close(sd->sd_nasid, sd->sd_subch); | 111 | ia64_sn_irtr_close(sd->sd_nasid, sd->sd_subch); |
112 | kfree(sd); | 112 | kfree(sd); |
113 | printk("%s: irq request failed (%d)\n", __FUNCTION__, rv); | 113 | printk("%s: irq request failed (%d)\n", __func__, rv); |
114 | return -EBUSY; | 114 | return -EBUSY; |
115 | } | 115 | } |
116 | 116 | ||
@@ -215,7 +215,7 @@ scdrv_read(struct file *file, char __user *buf, size_t count, loff_t *f_pos) | |||
215 | */ | 215 | */ |
216 | if (count < len) { | 216 | if (count < len) { |
217 | pr_debug("%s: only accepting %d of %d bytes\n", | 217 | pr_debug("%s: only accepting %d of %d bytes\n", |
218 | __FUNCTION__, (int) count, len); | 218 | __func__, (int) count, len); |
219 | } | 219 | } |
220 | len = min((int) count, len); | 220 | len = min((int) count, len); |
221 | if (copy_to_user(buf, sd->sd_rb, len)) | 221 | if (copy_to_user(buf, sd->sd_rb, len)) |
@@ -384,7 +384,7 @@ scdrv_init(void) | |||
384 | if (alloc_chrdev_region(&first_dev, 0, num_cnodes, | 384 | if (alloc_chrdev_region(&first_dev, 0, num_cnodes, |
385 | SYSCTL_BASENAME) < 0) { | 385 | SYSCTL_BASENAME) < 0) { |
386 | printk("%s: failed to register SN system controller device\n", | 386 | printk("%s: failed to register SN system controller device\n", |
387 | __FUNCTION__); | 387 | __func__); |
388 | return -ENODEV; | 388 | return -ENODEV; |
389 | } | 389 | } |
390 | snsc_class = class_create(THIS_MODULE, SYSCTL_BASENAME); | 390 | snsc_class = class_create(THIS_MODULE, SYSCTL_BASENAME); |
@@ -403,7 +403,7 @@ scdrv_init(void) | |||
403 | GFP_KERNEL); | 403 | GFP_KERNEL); |
404 | if (!scd) { | 404 | if (!scd) { |
405 | printk("%s: failed to allocate device info" | 405 | printk("%s: failed to allocate device info" |
406 | "for %s/%s\n", __FUNCTION__, | 406 | "for %s/%s\n", __func__, |
407 | SYSCTL_BASENAME, devname); | 407 | SYSCTL_BASENAME, devname); |
408 | continue; | 408 | continue; |
409 | } | 409 | } |
@@ -412,7 +412,7 @@ scdrv_init(void) | |||
412 | scd->scd_nasid = cnodeid_to_nasid(cnode); | 412 | scd->scd_nasid = cnodeid_to_nasid(cnode); |
413 | if (!(salbuf = kmalloc(SCDRV_BUFSZ, GFP_KERNEL))) { | 413 | if (!(salbuf = kmalloc(SCDRV_BUFSZ, GFP_KERNEL))) { |
414 | printk("%s: failed to allocate driver buffer" | 414 | printk("%s: failed to allocate driver buffer" |
415 | "(%s%s)\n", __FUNCTION__, | 415 | "(%s%s)\n", __func__, |
416 | SYSCTL_BASENAME, devname); | 416 | SYSCTL_BASENAME, devname); |
417 | kfree(scd); | 417 | kfree(scd); |
418 | continue; | 418 | continue; |
@@ -424,7 +424,7 @@ scdrv_init(void) | |||
424 | ("%s: failed to initialize SAL for" | 424 | ("%s: failed to initialize SAL for" |
425 | " system controller communication" | 425 | " system controller communication" |
426 | " (%s/%s): outdated PROM?\n", | 426 | " (%s/%s): outdated PROM?\n", |
427 | __FUNCTION__, SYSCTL_BASENAME, devname); | 427 | __func__, SYSCTL_BASENAME, devname); |
428 | kfree(scd); | 428 | kfree(scd); |
429 | kfree(salbuf); | 429 | kfree(salbuf); |
430 | continue; | 430 | continue; |
@@ -435,7 +435,7 @@ scdrv_init(void) | |||
435 | if (cdev_add(&scd->scd_cdev, dev, 1)) { | 435 | if (cdev_add(&scd->scd_cdev, dev, 1)) { |
436 | printk("%s: failed to register system" | 436 | printk("%s: failed to register system" |
437 | " controller device (%s%s)\n", | 437 | " controller device (%s%s)\n", |
438 | __FUNCTION__, SYSCTL_BASENAME, devname); | 438 | __func__, SYSCTL_BASENAME, devname); |
439 | kfree(scd); | 439 | kfree(scd); |
440 | kfree(salbuf); | 440 | kfree(salbuf); |
441 | continue; | 441 | continue; |