From: Paul Mackerras <paulus@samba.org>
To: torvalds@transmeta.com
Cc: linux-kernel@vger.kernel.org, linux-scsi@vger.kernel.org
Subject: [PATCH] Update mesh.c and mac53c94.c drivers
Date: Fri, 2 May 2003 15:40:08 +1000 [thread overview]
Message-ID: <16050.1208.626286.978120@argo.ozlabs.ibm.com> (raw)
This patch updates the mesh and mac53c94 SCSI host bus adaptor
drivers so that their interrupt routines return an irqreturn_t.
Please apply.
Thanks,
Paul.
diff -urN linux-2.5/drivers/scsi/mac53c94.c pmac-2.5/drivers/scsi/mac53c94.c
--- linux-2.5/drivers/scsi/mac53c94.c 2003-03-23 18:24:17.000000000 +1100
+++ pmac-2.5/drivers/scsi/mac53c94.c 2003-04-23 23:09:39.000000000 +1000
@@ -59,7 +59,7 @@
static void mac53c94_init(struct fsc_state *);
static void mac53c94_start(struct fsc_state *);
static void mac53c94_interrupt(int, void *, struct pt_regs *);
-static void do_mac53c94_interrupt(int, void *, struct pt_regs *);
+static irqreturn_t do_mac53c94_interrupt(int, void *, struct pt_regs *);
static void cmd_done(struct fsc_state *, int result);
static void set_dma_cmds(struct fsc_state *, Scsi_Cmnd *);
static int data_goes_out(Scsi_Cmnd *);
@@ -316,7 +316,7 @@
set_dma_cmds(state, cmd);
}
-static void
+static irqreturn_t
do_mac53c94_interrupt(int irq, void *dev_id, struct pt_regs *ptregs)
{
unsigned long flags;
@@ -325,6 +325,7 @@
spin_lock_irqsave(dev->host_lock, flags);
mac53c94_interrupt(irq, dev_id, ptregs);
spin_unlock_irqrestore(dev->host_lock, flags);
+ return IRQ_HANDLED;
}
static void
diff -urN linux-2.5/drivers/scsi/mesh.c pmac-2.5/drivers/scsi/mesh.c
--- linux-2.5/drivers/scsi/mesh.c 2003-03-23 18:24:17.000000000 +1100
+++ pmac-2.5/drivers/scsi/mesh.c 2003-04-23 23:09:26.000000000 +1000
@@ -212,7 +212,7 @@
static void handle_error(struct mesh_state *);
static void handle_exception(struct mesh_state *);
static void mesh_interrupt(int, void *, struct pt_regs *);
-static void do_mesh_interrupt(int, void *, struct pt_regs *);
+static irqreturn_t do_mesh_interrupt(int, void *, struct pt_regs *);
static void handle_msgin(struct mesh_state *);
static void mesh_done(struct mesh_state *, int);
static void mesh_completed(struct mesh_state *, Scsi_Cmnd *);
@@ -1471,7 +1471,7 @@
out_8(&mr->sequence, SEQ_ENBRESEL);
}
-static void
+static irqreturn_t
do_mesh_interrupt(int irq, void *dev_id, struct pt_regs *ptregs)
{
unsigned long flags;
@@ -1480,6 +1480,7 @@
spin_lock_irqsave(dev->host_lock, flags);
mesh_interrupt(irq, dev_id, ptregs);
spin_unlock_irqrestore(dev->host_lock, flags);
+ return IRQ_HANDLED;
}
static void handle_error(struct mesh_state *ms)
reply other threads:[~2003-05-02 6:08 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=16050.1208.626286.978120@argo.ozlabs.ibm.com \
--to=paulus@samba.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=torvalds@transmeta.com \
/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®