Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux

[linux-2.6-microblaze.git] / drivers / pnp / core.c

diff --git a/drivers/pnp/core.c b/drivers/pnp/core.c
index a50ab00..4df5aa6 100644 (file)
--- a/drivers/pnp/core.c
+++ b/drivers/pnp/core.c
@@ -31,18 +31,6 @@ DEFINE_MUTEX(pnp_lock);
 int pnp_platform_devices;
 EXPORT_SYMBOL(pnp_platform_devices);
 
-void *pnp_alloc(long size)
-{
-       void *result;
-
-       result = kzalloc(size, GFP_KERNEL);
-       if (!result) {
-               printk(KERN_ERR "pnp: Out of Memory\n");
-               return NULL;
-       }
-       return result;
-}
-
 static void pnp_remove_protocol(struct pnp_protocol *protocol)
 {
        mutex_lock(&pnp_lock);
@@ -227,9 +215,8 @@ int pnp_add_device(struct pnp_dev *dev)
        for (id = dev->id; id; id = id->next)
                len += scnprintf(buf + len, sizeof(buf) - len, " %s", id->id);
 
-       dev_printk(KERN_DEBUG, &dev->dev, "%s device, IDs%s (%s)\n",
-                  dev->protocol->name, buf,
-                  dev->active ? "active" : "disabled");
+       dev_dbg(&dev->dev, "%s device, IDs%s (%s)\n", dev->protocol->name, buf,
+               dev->active ? "active" : "disabled");
        return 0;
 }