V4L/DVB (7856): cx18/: possible cleanups

[linux-2.6] / drivers / base / memory.c

diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index 7891f7c97267402f19569cf8a1b015fc83bb2378..8ce6de5a7e289f4bcf5138d96d013ba71117d66f 100644 (file)
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
@@ -186,7 +186,7 @@ memory_block_action(struct memory_block *mem, unsigned long action)
                        break;
                default:
                        printk(KERN_WARNING "%s(%p, %ld) unknown action: %ld\n",
-                                       __FUNCTION__, mem, action, action);
+                                       __func__, mem, action, action);
                        WARN_ON(1);
                        ret = -EINVAL;
        }
@@ -444,6 +444,6 @@ int __init memory_dev_init(void)
                ret = err;
 out:
        if (ret)
-               printk(KERN_ERR "%s() failed: %d\n", __FUNCTION__, ret);
+               printk(KERN_ERR "%s() failed: %d\n", __func__, ret);
        return ret;
 }