From: Jeff Garzik <jeff@garzik.org>
To: LKML <linux-kernel@vger.kernel.org>
Cc: linux-pcmcia@lists.infradead.org
Subject: [PATCH 14/17] pcmcia/i82365: irq handler cleanups
Date: Sun, 21 Oct 2007 03:52:48 -0400 (EDT) [thread overview]
Message-ID: <20071021075248.40201190418@havoc.gtf.org> (raw)
In-Reply-To: <lkjvxcz09835mnsdfv0983q4m1234m@havoc.gtf.org>
commit c94109209f6d3aa2ff8c6c458552775f693ad7ee
Author: Jeff Garzik <jeff@garzik.org>
Date: Fri Oct 19 19:34:33 2007 -0400
pcmcia/i82365: irq handler cleanups
* pass irq number to irq handler via dev_id
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
drivers/pcmcia/i82365.c | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
c94109209f6d3aa2ff8c6c458552775f693ad7ee
diff --git a/drivers/pcmcia/i82365.c b/drivers/pcmcia/i82365.c
index 839bb1c..330150e 100644
--- a/drivers/pcmcia/i82365.c
+++ b/drivers/pcmcia/i82365.c
@@ -82,7 +82,8 @@ module_param(pc_debug, int, 0644);
static irqreturn_t i365_count_irq(int, void *);
static inline int _check_irq(int irq, int flags)
{
- if (request_irq(irq, i365_count_irq, flags, "x", i365_count_irq) != 0)
+ if (request_irq(irq, i365_count_irq, flags, "x",
+ (void *)(unsigned long) irq) != 0)
return -1;
free_irq(irq, i365_count_irq);
return 0;
@@ -497,8 +498,10 @@ static u_int __init set_bridge_opts(u_short s, u_short ns)
static volatile u_int irq_hits;
static u_short irq_sock;
-static irqreturn_t i365_count_irq(int irq, void *dev)
+static irqreturn_t i365_count_irq(int dummy, void *dev_id)
{
+ int irq = (int)(unsigned long) dev_id;
+
i365_get(irq_sock, I365_CSC);
irq_hits++;
debug(2, "-> hit on irq %d\n", irq);
@@ -509,7 +512,7 @@ static u_int __init test_irq(u_short sock, int irq)
{
debug(2, " testing ISA irq %d\n", irq);
if (request_irq(irq, i365_count_irq, IRQF_PROBE_SHARED, "scan",
- i365_count_irq) != 0)
+ (void *)(unsigned long) irq) != 0)
return 1;
irq_hits = 0; irq_sock = sock;
msleep(10);
@@ -847,8 +850,9 @@ static void __init isa_probe(void)
/*====================================================================*/
-static irqreturn_t pcic_interrupt(int irq, void *dev)
+static irqreturn_t pcic_interrupt(int dummy, void *dev_id)
{
+ int irq = (int)(unsigned long) dev_id;
int i, j, csc;
u_int events, active;
u_long flags = 0;
@@ -1293,7 +1297,8 @@ static int __init init_i82365(void)
/* Set up interrupt handler(s) */
if (grab_irq != 0)
- request_irq(cs_irq, pcic_interrupt, 0, "i82365", pcic_interrupt);
+ request_irq(cs_irq, pcic_interrupt, 0, "i82365",
+ (void *)(unsigned long) cs_irq);
/* register sockets with the pcmcia core */
for (i = 0; i < sockets; i++) {
next prev parent reply other threads:[~2007-10-21 7:56 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-21 7:52 [PATCH 0/17] various " Jeff Garzik
2007-10-21 7:52 ` [PATCH 1/17] " Jeff Garzik
2007-10-21 7:52 ` [PATCH 2/17] drivers/char/ip2: split out irq core logic into separate function Jeff Garzik
2007-10-21 7:52 ` [PATCH 3/17] drivers/char/ip2: separate polling and irq-driven work entry points Jeff Garzik
2007-10-21 7:52 ` [PATCH 4/17] char/pcmcia/synclink_cs: trim trailing whitespace Jeff Garzik
2007-10-21 7:52 ` [PATCH 5/17] drivers/char/pcmcia/synclink_cs.c: irq handler cleanups Jeff Garzik
2007-10-21 7:52 ` [PATCH 6/17] drivers/char/riscom8: " Jeff Garzik
2007-10-21 9:01 ` Jiri Slaby
2007-10-21 9:06 ` Jeff Garzik
2007-10-21 7:52 ` [PATCH 7/17] drivers/char/{rio,specialix,sx}: " Jeff Garzik
2007-10-21 7:52 ` [PATCH 8/17] arch/x86/kernel/vm86_32.c: irq handler cleanup Jeff Garzik
2007-10-21 9:21 ` Thomas Gleixner
2007-10-21 7:52 ` [PATCH 9/17] drivers/char/{synclink,tpm}: irq handler cleanups Jeff Garzik
2007-10-21 7:52 ` [PATCH 10/17] drivers/input/serio/i8042.c: irq handler clean Jeff Garzik
2007-10-21 17:57 ` Dmitry Torokhov
2007-10-30 12:36 ` Jeff Garzik
2007-10-21 7:52 ` [PATCH 11/17] isdn/act2000: fix major bug. clean irq handler Jeff Garzik
2007-10-21 7:52 ` [PATCH 12/17] isdn/sc: irq handler clean Jeff Garzik
2007-10-21 7:52 ` [PATCH 13/17] netdrvr irq handler cleanups Jeff Garzik
2007-10-21 7:52 ` Jeff Garzik [this message]
2007-10-21 7:52 ` [PATCH 15/17] serial, rtc/ds1374: " Jeff Garzik
2007-10-21 7:52 ` [PATCH 16/17] SCSI: driver " Jeff Garzik
2007-10-21 7:52 ` [PATCH 17/17] RTC interrupt handling cleanups Jeff Garzik
2007-10-21 16:40 ` Mike Frysinger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20071021075248.40201190418@havoc.gtf.org \
--to=jeff@garzik.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pcmcia@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®