Merge branch 'linus' into cpus4096

1 files changed, 4 insertions, 8 deletions

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;