From: Olaf Hering <olaf@aepfle.de>
To: linuxppc-dev@ozlabs.org, Andrew Morton <akpm@osdl.org>
Cc: linux-scsi@vger.kernel.org
Subject: [PATCH] cleanup variable usage in mesh interrupt handler
Date: Sat, 10 Feb 2007 21:37:33 +0100 [thread overview]
Message-ID: <20070210203733.GA25611@aepfle.de> (raw)
In-Reply-To: <20070210203614.GA25602@aepfle.de>
convert void* to struct mesh_state*
remove unused irq argument from mesh_interrupt()
Signed-off-by: Olaf Hering <olaf@aepfle.de>
---
drivers/scsi/mesh.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
Index: linux-2.6/drivers/scsi/mesh.c
===================================================================
--- linux-2.6.orig/drivers/scsi/mesh.c
+++ linux-2.6/drivers/scsi/mesh.c
@@ -185,7 +185,7 @@ struct mesh_state {
* Driver is too messy, we need a few prototypes...
*/
static void mesh_done(struct mesh_state *ms, int start_next);
-static void mesh_interrupt(int irq, void *dev_id);
+static void mesh_interrupt(struct mesh_state *ms);
static void cmd_complete(struct mesh_state *ms);
static void set_dma_cmds(struct mesh_state *ms, struct scsi_cmnd *cmd);
static void halt_dma(struct mesh_state *ms);
@@ -466,7 +466,7 @@ static void mesh_start_cmd(struct mesh_s
dlog(ms, "intr b4 arb, intr/exc/err/fc=%.8x",
MKWORD(mr->interrupt, mr->exception,
mr->error, mr->fifo_count));
- mesh_interrupt(0, (void *)ms);
+ mesh_interrupt(ms);
if (ms->phase != arbitrating)
return;
}
@@ -504,7 +504,7 @@ static void mesh_start_cmd(struct mesh_s
dlog(ms, "intr after disresel, intr/exc/err/fc=%.8x",
MKWORD(mr->interrupt, mr->exception,
mr->error, mr->fifo_count));
- mesh_interrupt(0, (void *)ms);
+ mesh_interrupt(ms);
if (ms->phase != arbitrating)
return;
dlog(ms, "after intr after disresel, intr/exc/err/fc=%.8x",
@@ -1018,10 +1018,11 @@ static void handle_reset(struct mesh_sta
static irqreturn_t do_mesh_interrupt(int irq, void *dev_id)
{
unsigned long flags;
- struct Scsi_Host *dev = ((struct mesh_state *)dev_id)->host;
+ struct mesh_state *ms = dev_id;
+ struct Scsi_Host *dev = ms->host;
spin_lock_irqsave(dev->host_lock, flags);
- mesh_interrupt(irq, dev_id);
+ mesh_interrupt(ms);
spin_unlock_irqrestore(dev->host_lock, flags);
return IRQ_HANDLED;
}
@@ -1661,9 +1662,8 @@ static int mesh_queue(struct scsi_cmnd *
* handler (do_mesh_interrupt) or by other functions in
* exceptional circumstances
*/
-static void mesh_interrupt(int irq, void *dev_id)
+static void mesh_interrupt(struct mesh_state *ms)
{
- struct mesh_state *ms = (struct mesh_state *) dev_id;
volatile struct mesh_regs __iomem *mr = ms->mesh;
int intr;
next prev parent reply other threads:[~2007-02-10 20:36 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-02-10 20:35 [PATCH] move variables in drivers/macintosh to bss Olaf Hering
2007-02-10 20:36 ` [PATCH] add delay around sl82c105_reset_engine calls Olaf Hering
2007-02-10 20:37 ` Olaf Hering [this message]
2007-02-10 20:38 ` [PATCH] mark winbond IDE PCI resources with start 0 as unassigned Olaf Hering
2007-02-10 20:40 ` [PATCH] correct AC Power: in /proc/pmu/info on ibook1 Olaf Hering
2007-02-15 23:09 ` [PATCH] add delay around sl82c105_reset_engine calls Jeff Garzik
2007-02-16 9:20 ` [PATCH] use winbond libata instead of ide driver for pseries CD drives Olaf Hering
2007-02-16 13:52 ` Sergei Shtylyov
2007-02-16 14:51 ` Sergei Shtylyov
2007-02-16 14:53 ` Bartlomiej Zolnierkiewicz
2007-02-16 14:55 ` Sergei Shtylyov
2007-02-16 15:09 ` Bartlomiej Zolnierkiewicz
2007-02-16 15:06 ` Sergei Shtylyov
2007-02-16 15:11 ` Sergei Shtylyov
2007-02-16 21:41 ` Benjamin Herrenschmidt
2007-02-16 14:46 ` Bartlomiej Zolnierkiewicz
2007-02-16 14:51 ` Bartlomiej Zolnierkiewicz
2007-02-16 17:37 ` Olaf Hering
2007-02-17 20:36 ` Jeff Garzik
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=20070210203733.GA25611@aepfle.de \
--to=olaf@aepfle.de \
--cc=akpm@osdl.org \
--cc=linux-scsi@vger.kernel.org \
--cc=linuxppc-dev@ozlabs.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;
as well as URLs for NNTP newsgroup(s).