Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa...

[karo-tx-linux.git] / drivers / s390 / cio / cio.h

diff --git a/drivers/s390/cio/cio.h b/drivers/s390/cio/cio.h
index bf7f80f5a330b7dc3a5ec26abc9cdbca48e51bb2..155a82bcb9e545e2888430337d0b1c2b50239acd 100644 (file)
--- a/drivers/s390/cio/cio.h
+++ b/drivers/s390/cio/cio.h
@@ -84,13 +84,6 @@ struct subchannel {
                SUBCHANNEL_TYPE_MSG = 2,
                SUBCHANNEL_TYPE_ADM = 3,
        } st;                   /* subchannel type */
-
-       struct {
-               unsigned int suspend:1; /* allow suspend */
-               unsigned int prefetch:1;/* deny prefetch */
-               unsigned int inter:1;   /* suppress intermediate interrupts */
-       } __attribute__ ((packed)) options;
-
        __u8 vpm;               /* verified path mask */
        __u8 lpm;               /* logical path mask */
        __u8 opm;               /* operational path mask */
@@ -99,14 +92,11 @@ struct subchannel {
        struct chsc_ssd_info ssd_info;  /* subchannel description */
        struct device dev;      /* entry in device tree */
        struct css_driver *driver;
-       void *private; /* private per subchannel type data */
        enum sch_todo todo;
        struct work_struct todo_work;
        struct schib_config config;
 } __attribute__ ((aligned(8)));
 
-#define IO_INTERRUPT_TYPE         0 /* I/O interrupt type */
-
 #define to_subchannel(n) container_of(n, struct subchannel, dev)
 
 extern int cio_validate_subchannel (struct subchannel *, struct subchannel_id);
@@ -120,7 +110,6 @@ extern int cio_start (struct subchannel *, struct ccw1 *, __u8);
 extern int cio_start_key (struct subchannel *, struct ccw1 *, __u8, __u8);
 extern int cio_cancel (struct subchannel *);
 extern int cio_set_options (struct subchannel *, int);
-extern int cio_get_options (struct subchannel *);
 extern int cio_update_schib(struct subchannel *sch);
 extern int cio_commit_config(struct subchannel *sch);