lkml.org 
[lkml]   [2008]   [Apr]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 5/6] typesafe: request_irq and devm_request_irq
Date
This patch lets interrupt handler functions have their natural type
(ie. exactly match the data pointer type); it allows the old irq_handler_t
type as well.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
---
include/linux/interrupt.h | 14 ++++++++++++--
kernel/irq/devres.c | 10 +++++-----
kernel/irq/manage.c | 6 +++---
3 files changed, 20 insertions(+), 10 deletions(-)

diff -r b285fd1d3230 include/linux/interrupt.h
--- a/include/linux/interrupt.h Mon Apr 07 15:48:58 2008 +1000
+++ b/include/linux/interrupt.h Mon Apr 07 15:57:39 2008 +1000
@@ -69,13 +69,23 @@ struct irqaction {
};

extern irqreturn_t no_action(int cpl, void *dev_id);
-extern int __must_check request_irq(unsigned int, irq_handler_t handler,
+
+/* Typesafe version of request_irq. Also takes old-style void * handlers. */
+#define request_irq(irq, handler, flags, name, dev_id) \
+ __request_irq((irq), typesafe_cb_preargs(int,(handler),(dev_id),int), \
+ (flags), (name), (dev_id))
+
+extern int __must_check __request_irq(unsigned int, irq_handler_t handler,
unsigned long, const char *, void *);
extern void free_irq(unsigned int, void *);

struct device;

-extern int __must_check devm_request_irq(struct device *dev, unsigned int irq,
+#define devm_request_irq(dev, irq, handler, flags, name, dev_id) \
+ __devm_request_irq((dev), (irq), \
+ typesafe_cb_preargs(int, (handler), (dev_id), int), \
+ (flags), (name), (dev_id))
+extern int __must_check __devm_request_irq(struct device *dev, unsigned int irq,
irq_handler_t handler, unsigned long irqflags,
const char *devname, void *dev_id);
extern void devm_free_irq(struct device *dev, unsigned int irq, void *dev_id);
diff -r b285fd1d3230 kernel/irq/devres.c
--- a/kernel/irq/devres.c Mon Apr 07 15:48:58 2008 +1000
+++ b/kernel/irq/devres.c Mon Apr 07 15:57:39 2008 +1000
@@ -41,9 +41,9 @@ static int devm_irq_match(struct device
* If an IRQ allocated with this function needs to be freed
* separately, dev_free_irq() must be used.
*/
-int devm_request_irq(struct device *dev, unsigned int irq,
- irq_handler_t handler, unsigned long irqflags,
- const char *devname, void *dev_id)
+int __devm_request_irq(struct device *dev, unsigned int irq,
+ irq_handler_t handler, unsigned long irqflags,
+ const char *devname, void *dev_id)
{
struct irq_devres *dr;
int rc;
@@ -53,7 +53,7 @@ int devm_request_irq(struct device *dev,
if (!dr)
return -ENOMEM;

- rc = request_irq(irq, handler, irqflags, devname, dev_id);
+ rc = __request_irq(irq, handler, irqflags, devname, dev_id);
if (rc) {
devres_free(dr);
return rc;
@@ -65,7 +65,7 @@ int devm_request_irq(struct device *dev,

return 0;
}
-EXPORT_SYMBOL(devm_request_irq);
+EXPORT_SYMBOL(__devm_request_irq);

/**
* devm_free_irq - free an interrupt
diff -r b285fd1d3230 kernel/irq/manage.c
--- a/kernel/irq/manage.c Mon Apr 07 15:48:58 2008 +1000
+++ b/kernel/irq/manage.c Mon Apr 07 15:57:39 2008 +1000
@@ -517,8 +517,8 @@ EXPORT_SYMBOL(free_irq);
* IRQF_SAMPLE_RANDOM The interrupt can be used for entropy
*
*/
-int request_irq(unsigned int irq, irq_handler_t handler,
- unsigned long irqflags, const char *devname, void *dev_id)
+int __request_irq(unsigned int irq, irq_handler_t handler,
+ unsigned long irqflags, const char *devname, void *dev_id)
{
struct irqaction *action;
int retval;
@@ -579,4 +579,4 @@ int request_irq(unsigned int irq, irq_ha

return retval;
}
-EXPORT_SYMBOL(request_irq);
+EXPORT_SYMBOL(__request_irq);

\
 
 \ /
  Last update: 2008-04-21 01:11    [W:0.049 / U:33.148 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site