[S390] cio: remove stsch

[safe/jmp/linux-2.6] / drivers / s390 / cio / io_sch.h

diff --git a/drivers/s390/cio/io_sch.h b/drivers/s390/cio/io_sch.h
index b387c80..b9ce712 100644 (file)
--- a/drivers/s390/cio/io_sch.h
+++ b/drivers/s390/cio/io_sch.h
@@ -109,7 +109,7 @@ struct ccw_request {
        void (*callback)(struct ccw_device *, void *, int);
        void *data;
        /* These fields are used internally. */
-       u8 mask;
+       u16 mask;
        u16 retries;
        int drc;
        int cancel:1;
@@ -145,12 +145,12 @@ struct ccw_device_private {
        struct subchannel *sch;
        int state;              /* device state */
        atomic_t onoff;
-       unsigned long registered;
        struct ccw_dev_id dev_id;       /* device id */
        struct subchannel_id schid;     /* subchannel number */
        struct ccw_request req;         /* internal I/O request */
        int iretry;
        u8 pgid_valid_mask;             /* mask of valid PGIDs */
+       u8 pgid_todo_mask;              /* mask of PGIDs to be adjusted */
        struct {
                unsigned int fast:1;    /* post with "channel end" */
                unsigned int repall:1;  /* report every interrupt status */
@@ -166,9 +166,9 @@ struct ccw_device_private {
                unsigned int recog_done:1;  /* dev. recog. complete */
                unsigned int fake_irb:1;    /* deliver faked irb */
                unsigned int resuming:1;    /* recognition while resume */
-               unsigned int pgid_rdy:1;    /* pgids are ready */
                unsigned int pgroup:1;      /* pathgroup is set up */
                unsigned int mpath:1;       /* multipathing is set up */
+               unsigned int initialized:1; /* set if initial reference held */
        } __attribute__((packed)) flags;
        unsigned long intparm;  /* user interruption parameter */
        struct qdio_irq *qdio_data;