Merge branch 'omap-serial' of git://git.linaro.org/people/rmk/linux-arm

[karo-tx-linux.git] / drivers / base / devres.c

diff --git a/drivers/base/devres.c b/drivers/base/devres.c
index 8731979d668a0592cc966191f8af1df9ab155a60..6683906647640da75238198ac47a07561fd131f9 100644 (file)
--- a/drivers/base/devres.c
+++ b/drivers/base/devres.c
@@ -50,8 +50,8 @@ static void devres_log(struct device *dev, struct devres_node *node,
                       const char *op)
 {
        if (unlikely(log_devres))
-               dev_printk(KERN_ERR, dev, "DEVRES %3s %p %s (%lu bytes)\n",
-                          op, node, node->name, (unsigned long)node->size);
+               dev_err(dev, "DEVRES %3s %p %s (%lu bytes)\n",
+                       op, node, node->name, (unsigned long)node->size);
 }
 #else /* CONFIG_DEBUG_DEVRES */
 #define set_node_dbginfo(node, n, s)   do {} while (0)