aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/base/memory.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/base/memory.c')
-rw-r--r--drivers/base/memory.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index 7891f7c97267..8ce6de5a7e28 100644
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
@@ -186,7 +186,7 @@ memory_block_action(struct memory_block *mem, unsigned long action)
186 break; 186 break;
187 default: 187 default:
188 printk(KERN_WARNING "%s(%p, %ld) unknown action: %ld\n", 188 printk(KERN_WARNING "%s(%p, %ld) unknown action: %ld\n",
189 __FUNCTION__, mem, action, action); 189 __func__, mem, action, action);
190 WARN_ON(1); 190 WARN_ON(1);
191 ret = -EINVAL; 191 ret = -EINVAL;
192 } 192 }
@@ -444,6 +444,6 @@ int __init memory_dev_init(void)
444 ret = err; 444 ret = err;
445out: 445out:
446 if (ret) 446 if (ret)
447 printk(KERN_ERR "%s() failed: %d\n", __FUNCTION__, ret); 447 printk(KERN_ERR "%s() failed: %d\n", __func__, ret);
448 return ret; 448 return ret;
449} 449}