2.5.39 s390 (22/26): s390_process_IRQ.

2.5.39 s390 (22/26): s390_process_IRQ.

Post by Martin Schwidefsk » Tue, 01 Oct 2002 16:40:08



Cleanup s390_process_IRQ a little, the ending_status argument is never
really used.

diff -urN linux-2.5.39/drivers/s390/cio/cio.c linux-2.5.39-s390/drivers/s390/cio/cio.c
--- linux-2.5.39/drivers/s390/cio/cio.c Mon Sep 30 13:33:37 2002

  * 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 */

  * 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;

         * take fast exit if no handler is available
         */
        if (!ioinfo[irq]->ui.flags.ready)
-               return (ending_status);
+               return 0;

        memcpy (udp, &(ioinfo[irq]->devstat),

        int irb_cc;             /* cond code from irb */

        int issense = 0;
-       int ending_status = 0;
        devstat_t *dp;
        devstat_t *udp;

        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);
 }

 /*

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in

More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/