Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f810a5cf authored by Arjan van de Ven's avatar Arjan van de Ven Committed by Linus Torvalds
Browse files

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: default avatarArjan van de Ven <arjan@linux.intel.com>
Cc: Greg KH <greg@kroah.com>
Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 12e00368

drivers/base/core.c

+2 −4
Original line number Diff line number Diff line
@@ -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 = {

drivers/base/memory.c

+1 −2
Original line number Diff line number Diff line
@@ -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;

	}

drivers/base/sys.c

+4 −8
Original line number Diff line number Diff line
@@ -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;