From: Martin Schwidefsky <schwidefsky@de.ibm.com>
To: linux-kernel@vger.kernel.org, torvalds@transmeta.com
Subject: [PATCH] 2.5.40 s390 (22/27): s390_process_IRQ.
Date: Fri, 4 Oct 2002 16:34:02 +0200 [thread overview]
Message-ID: <200210041634.02407.schwidefsky@de.ibm.com> (raw)
Cleanup s390_process_IRQ a little, the ending_status argument is never
really used.
diff -urN linux-2.5.40/drivers/s390/cio/cio.c linux-2.5.40-s390/drivers/s390/cio/cio.c
--- linux-2.5.40/drivers/s390/cio/cio.c Fri Oct 4 16:16:33 2002
+++ linux-2.5.40-s390/drivers/s390/cio/cio.c Fri Oct 4 16:16:33 2002
@@ -1065,9 +1065,9 @@
* for cc=0 and cc=1 after tsch
*/
static inline int
-s390_process_IRQ_normal(unsigned int irq,
- int ending_status)
+s390_process_IRQ_normal(unsigned int irq)
{
+ int ending_status;
unsigned int fctl; /* function control */
unsigned int stctl; /* status control */
unsigned int actl; /* activity control */
@@ -1315,8 +1315,7 @@
* for cc=3 after tsch
*/
static inline int
-s390_process_IRQ_notoper(unsigned int irq,
- int ending_status)
+s390_process_IRQ_notoper(unsigned int irq)
{
devstat_t *dp;
devstat_t *udp;
@@ -1379,7 +1378,7 @@
* take fast exit if no handler is available
*/
if (!ioinfo[irq]->ui.flags.ready)
- return (ending_status);
+ return 0;
memcpy (udp, &(ioinfo[irq]->devstat),
sizeof(devstat_t) -
@@ -1417,7 +1416,6 @@
int irb_cc; /* cond code from irb */
int issense = 0;
- int ending_status = 0;
devstat_t *dp;
devstat_t *udp;
scsw_t *scsw;
@@ -1610,25 +1608,14 @@
switch (irb_cc) {
case 1: /* status pending */
-
dp->flag |= DEVSTAT_STATUS_PENDING;
case 0: /* normal i/o interruption */
+ return s390_process_IRQ_normal(irq);
- ending_status = s390_process_IRQ_normal(irq, ending_status);
-
-
- break;
-
- case 3: /* device/path not operational */
-
- ending_status = s390_process_IRQ_notoper(irq, ending_status);
-
- break;
-
+ default: /* device/path not operational */
+ return s390_process_IRQ_notoper(irq);
}
-
- return (ending_status);
}
/*
reply other threads:[~2002-10-04 17:35 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=200210041634.02407.schwidefsky@de.ibm.com \
--to=schwidefsky@de.ibm.com \
--cc=linux-kernel@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®