s390/cio: move struct node_descriptor to cio.h (96e5aaf9) · Commits · 戴 / test

arch/s390/include/asm/cio.h

+30 −0

Original line number	Diff line number	Diff line
		@@ -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()
		*/

+0 −30

Original line number	Diff line number	Diff line
		@@ -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"
		*/