aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/base/attribute_container.c2
-rw-r--r--drivers/base/devres.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/base/attribute_container.c b/drivers/base/attribute_container.c
index 8fc200b2e2c0..d78b204e65c1 100644
--- a/drivers/base/attribute_container.c
+++ b/drivers/base/attribute_container.c
@@ -158,7 +158,7 @@ attribute_container_add_device(struct device *dev,
158 158
159 ic = kzalloc(sizeof(*ic), GFP_KERNEL); 159 ic = kzalloc(sizeof(*ic), GFP_KERNEL);
160 if (!ic) { 160 if (!ic) {
161 dev_printk(KERN_ERR, dev, "failed to allocate class container\n"); 161 dev_err(dev, "failed to allocate class container\n");
162 continue; 162 continue;
163 } 163 }
164 164
diff --git a/drivers/base/devres.c b/drivers/base/devres.c
index 8731979d668a..668390664764 100644
--- 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,
50 const char *op) 50 const char *op)
51{ 51{
52 if (unlikely(log_devres)) 52 if (unlikely(log_devres))
53 dev_printk(KERN_ERR, dev, "DEVRES %3s %p %s (%lu bytes)\n", 53 dev_err(dev, "DEVRES %3s %p %s (%lu bytes)\n",
54 op, node, node->name, (unsigned long)node->size); 54 op, node, node->name, (unsigned long)node->size);
55} 55}
56#else /* CONFIG_DEBUG_DEVRES */ 56#else /* CONFIG_DEBUG_DEVRES */
57#define set_node_dbginfo(node, n, s) do {} while (0) 57#define set_node_dbginfo(node, n, s) do {} while (0)