s390/cio: move struct node_descriptor to cio.h

This allows device drivers (eg. qeth) to use the struct when processing
information retrieved via RCD.

Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com>
Acked-by: Sebastian Ott <sebott@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>

diff --git a/arch/s390/include/asm/cio.h b/arch/s390/include/asm/cio.h
index 58e7db912c30300c871085a933fe4f284fe7e17b..b5bfb3123cb1fe004ebe025f9a020c0fbdd99b6b 100644 (file)
--- a/arch/s390/include/asm/cio.h
+++ b/arch/s390/include/asm/cio.h
@@ -264,6 +264,36 @@ struct ciw {
 #define CIW_TYPE_SII   0x1     /* set interface identifier */
 #define CIW_TYPE_RNI   0x2     /* read node identifier */
 
+/*
+ * Node Descriptor as defined in SA22-7204, "Common I/O-Device Commands"
+ */
+
+#define ND_VALIDITY_VALID      0
+#define ND_VALIDITY_OUTDATED   1
+#define ND_VALIDITY_INVALID    2
+
+struct node_descriptor {
+       /* Flags. */
+       union {
+               struct {
+                       u32 validity:3;
+                       u32 reserved:5;
+               } __packed;
+               u8 byte0;
+       } __packed;
+
+       /* Node parameters. */
+       u32 params:24;
+
+       /* Node ID. */
+       char type[6];
+       char model[3];
+       char manufacturer[3];
+       char plant[2];
+       char seq[12];
+       u16 tag;
+} __packed;
+
 /*
  * Flags used as input parameters for do_IO()
  */

diff --git a/drivers/s390/cio/chsc.c b/drivers/s390/cio/chsc.c
index a835b31aad999dcbc90847455b0c75f612aba563..6392a1b95b028097421b0262ac566c2e5854db57 100644 (file)
--- a/drivers/s390/cio/chsc.c
+++ b/drivers/s390/cio/chsc.c
@@ -322,36 +322,6 @@ struct chsc_sei {
        } u;
 } __packed __aligned(PAGE_SIZE);
 
-/*
- * Node Descriptor as defined in SA22-7204, "Common I/O-Device Commands"
- */
-
-#define ND_VALIDITY_VALID      0
-#define ND_VALIDITY_OUTDATED   1
-#define ND_VALIDITY_INVALID    2
-
-struct node_descriptor {
-       /* Flags. */
-       union {
-               struct {
-                       u32 validity:3;
-                       u32 reserved:5;
-               } __packed;
-               u8 byte0;
-       } __packed;
-
-       /* Node parameters. */
-       u32 params:24;
-
-       /* Node ID. */
-       char type[6];
-       char model[3];
-       char manufacturer[3];
-       char plant[2];
-       char seq[12];
-       u16 tag;
-} __packed;
-
 /*
  * Link Incident Record as defined in SA22-7202, "ESCON I/O Interface"
  */