Use WARN() in drivers/base/

Use WARN() instead of a printk+WARN_ON() pair; this way the message
becomes part of the warning section for better reporting/collection.

Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Cc: Greg KH <greg@kroah.com>
Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

3 files changed, 7 insertions, 14 deletions

diff --git a/drivers/base/core.c b/drivers/base/core.c
index 7d5c63c81a59..068aa1c9538c 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -116,12 +116,10 @@ static void device_release(struct kobject *kobj)
                 dev->type->release(dev);
         else if (dev->class && dev->class->dev_release)
                 dev->class->dev_release(dev);
-        else {
-                printk(KERN_ERR "Device '%s' does not have a release() "
+        else
+                WARN(1, KERN_ERR "Device '%s' does not have a release() "
                         "function, it is broken and must be fixed.\n",
                         dev->bus_id);
-                WARN_ON(1);
-        }
 }
 
 static struct kobj_type device_ktype = {
diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index 855ed1a9f97b..3ad49a00029f 100644
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
@@ -204,9 +204,8 @@ memory_block_action(struct memory_block *mem, unsigned long action)
                         }
                         break;
                 default:
-                        printk(KERN_WARNING "%s(%p, %ld) unknown action: %ld\n",
+                        WARN(1, KERN_WARNING "%s(%p, %ld) unknown action: %ld\n",
                                         __func__, mem, action, action);
-                        WARN_ON(1);
                         ret = -EINVAL;
         }
 
diff --git a/drivers/base/sys.c b/drivers/base/sys.c
index 40fc14f03540..75dd6e22faff 100644
--- a/drivers/base/sys.c
+++ b/drivers/base/sys.c
@@ -168,19 +168,16 @@ int sysdev_driver_register(struct sysdev_class *cls, struct sysdev_driver *drv)
         int err = 0;
 
         if (!cls) {
-                printk(KERN_WARNING "sysdev: invalid class passed to "
+                WARN(1, KERN_WARNING "sysdev: invalid class passed to "
                         "sysdev_driver_register!\n");
-                WARN_ON(1);
                 return -EINVAL;
         }
 
         /* Check whether this driver has already been added to a class. */
-        if (drv->entry.next && !list_empty(&drv->entry)) {
-                printk(KERN_WARNING "sysdev: class %s: driver (%p) has already"
+        if (drv->entry.next && !list_empty(&drv->entry))
+                WARN(1, KERN_WARNING "sysdev: class %s: driver (%p) has already"
                         " been registered to a class, something is wrong, but "
                         "will forge on!\n", cls->name, drv);
-                WARN_ON(1);
-        }
 
         mutex_lock(&sysdev_drivers_lock);
         if (cls && kset_get(&cls->kset)) {
@@ -194,8 +191,7 @@ int sysdev_driver_register(struct sysdev_class *cls, struct sysdev_driver *drv)
                 }
         } else {
                 err = -EINVAL;
-                printk(KERN_ERR "%s: invalid device class\n", __func__);
-                WARN_ON(1);
+                WARN(1, KERN_ERR "%s: invalid device class\n", __func__);
         }
         mutex_unlock(&sysdev_drivers_lock);
         return err;