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

Commit 899b5fbf authored by Heiner Kallweit's avatar Heiner Kallweit Committed by Thomas Gleixner
Browse files

genirq/devres: Use dev_name(dev) as default for devname 



Allow the devname parameter to be NULL and use dev_name(dev) in this case.
This should be an appropriate default for most use cases.

Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Link: http://lkml.kernel.org/r/05c63d67-30b4-7026-02d5-ce7fb7bc185f@gmail.com


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent f435da41

kernel/irq/devres.c

+8 −2
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ static int devm_irq_match(struct device *dev, void *res, void *data) 
 *	@thread_fn: function to be called in a threaded interrupt context. NULL

 *		    for devices which handle everything in @handler

 *	@irqflags: Interrupt type flags

 *	@devname: An ascii name for the claiming device

 *	@devname: An ascii name for the claiming device, dev_name(dev) if NULL

 *	@dev_id: A cookie passed back to the handler function

 *

 *	Except for the extra @dev argument, this function takes the
@@ -58,6 +58,9 @@ int devm_request_threaded_irq(struct device *dev, unsigned int irq, 
	if (!dr)

		return -ENOMEM;



	if (!devname)

		devname = dev_name(dev);



	rc = request_threaded_irq(irq, handler, thread_fn, irqflags, devname,

				  dev_id);

	if (rc) {
@@ -81,7 +84,7 @@ EXPORT_SYMBOL(devm_request_threaded_irq); 
 *	@thread_fn: function to be called in a threaded interrupt context. NULL

 *		    for devices which handle everything in @handler

 *	@irqflags: Interrupt type flags

 *	@devname: An ascii name for the claiming device

 *	@devname: An ascii name for the claiming device, dev_name(dev) if NULL

 *	@dev_id: A cookie passed back to the handler function

 *

 *	Except for the extra @dev argument, this function takes the
@@ -104,6 +107,9 @@ int devm_request_any_context_irq(struct device *dev, unsigned int irq, 
	if (!dr)

		return -ENOMEM;



	if (!devname)

		devname = dev_name(dev);



	rc = request_any_context_irq(irq, handler, irqflags, devname, dev_id);

	if (rc < 0) {

		devres_free(dr);