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>
This commit is contained in:

committed by
Linus Torvalds

parent
8e24eea728
commit
bf9d892952
@@ -80,7 +80,7 @@ scdrv_open(struct inode *inode, struct file *file)
|
||||
sd = kzalloc(sizeof (struct subch_data_s), GFP_KERNEL);
|
||||
if (sd == NULL) {
|
||||
printk("%s: couldn't allocate subchannel data\n",
|
||||
__FUNCTION__);
|
||||
__func__);
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
@@ -90,7 +90,7 @@ scdrv_open(struct inode *inode, struct file *file)
|
||||
|
||||
if (sd->sd_subch < 0) {
|
||||
kfree(sd);
|
||||
printk("%s: couldn't allocate subchannel\n", __FUNCTION__);
|
||||
printk("%s: couldn't allocate subchannel\n", __func__);
|
||||
return -EBUSY;
|
||||
}
|
||||
|
||||
@@ -110,7 +110,7 @@ scdrv_open(struct inode *inode, struct file *file)
|
||||
if (rv) {
|
||||
ia64_sn_irtr_close(sd->sd_nasid, sd->sd_subch);
|
||||
kfree(sd);
|
||||
printk("%s: irq request failed (%d)\n", __FUNCTION__, rv);
|
||||
printk("%s: irq request failed (%d)\n", __func__, rv);
|
||||
return -EBUSY;
|
||||
}
|
||||
|
||||
@@ -215,7 +215,7 @@ scdrv_read(struct file *file, char __user *buf, size_t count, loff_t *f_pos)
|
||||
*/
|
||||
if (count < len) {
|
||||
pr_debug("%s: only accepting %d of %d bytes\n",
|
||||
__FUNCTION__, (int) count, len);
|
||||
__func__, (int) count, len);
|
||||
}
|
||||
len = min((int) count, len);
|
||||
if (copy_to_user(buf, sd->sd_rb, len))
|
||||
@@ -384,7 +384,7 @@ scdrv_init(void)
|
||||
if (alloc_chrdev_region(&first_dev, 0, num_cnodes,
|
||||
SYSCTL_BASENAME) < 0) {
|
||||
printk("%s: failed to register SN system controller device\n",
|
||||
__FUNCTION__);
|
||||
__func__);
|
||||
return -ENODEV;
|
||||
}
|
||||
snsc_class = class_create(THIS_MODULE, SYSCTL_BASENAME);
|
||||
@@ -403,7 +403,7 @@ scdrv_init(void)
|
||||
GFP_KERNEL);
|
||||
if (!scd) {
|
||||
printk("%s: failed to allocate device info"
|
||||
"for %s/%s\n", __FUNCTION__,
|
||||
"for %s/%s\n", __func__,
|
||||
SYSCTL_BASENAME, devname);
|
||||
continue;
|
||||
}
|
||||
@@ -412,7 +412,7 @@ scdrv_init(void)
|
||||
scd->scd_nasid = cnodeid_to_nasid(cnode);
|
||||
if (!(salbuf = kmalloc(SCDRV_BUFSZ, GFP_KERNEL))) {
|
||||
printk("%s: failed to allocate driver buffer"
|
||||
"(%s%s)\n", __FUNCTION__,
|
||||
"(%s%s)\n", __func__,
|
||||
SYSCTL_BASENAME, devname);
|
||||
kfree(scd);
|
||||
continue;
|
||||
@@ -424,7 +424,7 @@ scdrv_init(void)
|
||||
("%s: failed to initialize SAL for"
|
||||
" system controller communication"
|
||||
" (%s/%s): outdated PROM?\n",
|
||||
__FUNCTION__, SYSCTL_BASENAME, devname);
|
||||
__func__, SYSCTL_BASENAME, devname);
|
||||
kfree(scd);
|
||||
kfree(salbuf);
|
||||
continue;
|
||||
@@ -435,7 +435,7 @@ scdrv_init(void)
|
||||
if (cdev_add(&scd->scd_cdev, dev, 1)) {
|
||||
printk("%s: failed to register system"
|
||||
" controller device (%s%s)\n",
|
||||
__FUNCTION__, SYSCTL_BASENAME, devname);
|
||||
__func__, SYSCTL_BASENAME, devname);
|
||||
kfree(scd);
|
||||
kfree(salbuf);
|
||||
continue;
|
||||
|
Reference in New Issue
Block a user