Commit 09212816 authored by Martin Schwidefsky's avatar Martin Schwidefsky Committed by Linus Torvalds

[PATCH] s390 update (22/27): s390_process_IRQ.

Cleanup s390_process_IRQ a little, the ending_status argument is never
really used.
parent 9c6615ff
...@@ -1065,9 +1065,9 @@ s390_reset_flags_after_ending_status(int irq) ...@@ -1065,9 +1065,9 @@ s390_reset_flags_after_ending_status(int irq)
* for cc=0 and cc=1 after tsch * for cc=0 and cc=1 after tsch
*/ */
static inline int static inline int
s390_process_IRQ_normal(unsigned int irq, s390_process_IRQ_normal(unsigned int irq)
int ending_status)
{ {
int ending_status;
unsigned int fctl; /* function control */ unsigned int fctl; /* function control */
unsigned int stctl; /* status control */ unsigned int stctl; /* status control */
unsigned int actl; /* activity control */ unsigned int actl; /* activity control */
...@@ -1315,8 +1315,7 @@ s390_process_IRQ_normal(unsigned int irq, ...@@ -1315,8 +1315,7 @@ s390_process_IRQ_normal(unsigned int irq,
* for cc=3 after tsch * for cc=3 after tsch
*/ */
static inline int static inline int
s390_process_IRQ_notoper(unsigned int irq, s390_process_IRQ_notoper(unsigned int irq)
int ending_status)
{ {
devstat_t *dp; devstat_t *dp;
devstat_t *udp; devstat_t *udp;
...@@ -1379,7 +1378,7 @@ s390_process_IRQ_notoper(unsigned int irq, ...@@ -1379,7 +1378,7 @@ s390_process_IRQ_notoper(unsigned int irq,
* take fast exit if no handler is available * take fast exit if no handler is available
*/ */
if (!ioinfo[irq]->ui.flags.ready) if (!ioinfo[irq]->ui.flags.ready)
return (ending_status); return 0;
memcpy (udp, &(ioinfo[irq]->devstat), memcpy (udp, &(ioinfo[irq]->devstat),
sizeof(devstat_t) - sizeof(devstat_t) -
...@@ -1417,7 +1416,6 @@ s390_process_IRQ (unsigned int irq) ...@@ -1417,7 +1416,6 @@ s390_process_IRQ (unsigned int irq)
int irb_cc; /* cond code from irb */ int irb_cc; /* cond code from irb */
int issense = 0; int issense = 0;
int ending_status = 0;
devstat_t *dp; devstat_t *dp;
devstat_t *udp; devstat_t *udp;
scsw_t *scsw; scsw_t *scsw;
...@@ -1610,25 +1608,14 @@ s390_process_IRQ (unsigned int irq) ...@@ -1610,25 +1608,14 @@ s390_process_IRQ (unsigned int irq)
switch (irb_cc) { switch (irb_cc) {
case 1: /* status pending */ case 1: /* status pending */
dp->flag |= DEVSTAT_STATUS_PENDING; dp->flag |= DEVSTAT_STATUS_PENDING;
case 0: /* normal i/o interruption */ case 0: /* normal i/o interruption */
return s390_process_IRQ_normal(irq);
ending_status = s390_process_IRQ_normal(irq, ending_status); default: /* device/path not operational */
return s390_process_IRQ_notoper(irq);
break;
case 3: /* device/path not operational */
ending_status = s390_process_IRQ_notoper(irq, ending_status);
break;
} }
return (ending_status);
} }
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment