Commit 8a80b108 authored by Peter Oberparleiter's avatar Peter Oberparleiter Committed by Martin Schwidefsky
Browse files

s390/cio: fix error-prone defines 



Missing parenthesis may cause problems when using the defines
together with operations of higher precedence.

Signed-off-by: default avatarPeter Oberparleiter <peter.oberparleiter@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 58952942

arch/s390/include/asm/fcx.h

+19 −19
Original line number Diff line number Diff line
@@ -12,9 +12,9 @@ 


#define TCW_FORMAT_DEFAULT		0

#define TCW_TIDAW_FORMAT_DEFAULT	0

#define TCW_FLAGS_INPUT_TIDA		1 << (23 - 5)

#define TCW_FLAGS_TCCB_TIDA		1 << (23 - 6)

#define TCW_FLAGS_OUTPUT_TIDA		1 << (23 - 7)

#define TCW_FLAGS_INPUT_TIDA		(1 << (23 - 5))

#define TCW_FLAGS_TCCB_TIDA		(1 << (23 - 6))

#define TCW_FLAGS_OUTPUT_TIDA		(1 << (23 - 7))

#define TCW_FLAGS_TIDAW_FORMAT(x)	((x) & 3) << (23 - 9)

#define TCW_FLAGS_GET_TIDAW_FORMAT(x)	(((x) >> (23 - 9)) & 3)
@@ -54,11 +54,11 @@ struct tcw { 
	u32 intrg;

} __attribute__ ((packed, aligned(64)));



#define TIDAW_FLAGS_LAST		1 << (7 - 0)

#define TIDAW_FLAGS_SKIP		1 << (7 - 1)

#define TIDAW_FLAGS_DATA_INT		1 << (7 - 2)

#define TIDAW_FLAGS_TTIC		1 << (7 - 3)

#define TIDAW_FLAGS_INSERT_CBC		1 << (7 - 4)

#define TIDAW_FLAGS_LAST		(1 << (7 - 0))

#define TIDAW_FLAGS_SKIP		(1 << (7 - 1))

#define TIDAW_FLAGS_DATA_INT		(1 << (7 - 2))

#define TIDAW_FLAGS_TTIC		(1 << (7 - 3))

#define TIDAW_FLAGS_INSERT_CBC		(1 << (7 - 4))



/**

 * struct tidaw - Transport-Indirect-Addressing Word (TIDAW)
@@ -106,9 +106,9 @@ struct tsa_ddpc { 
	u8 sense[32];

} __attribute__ ((packed));



#define TSA_INTRG_FLAGS_CU_STATE_VALID		1 << (7 - 0)

#define TSA_INTRG_FLAGS_DEV_STATE_VALID		1 << (7 - 1)

#define TSA_INTRG_FLAGS_OP_STATE_VALID		1 << (7 - 2)

#define TSA_INTRG_FLAGS_CU_STATE_VALID		(1 << (7 - 0))

#define TSA_INTRG_FLAGS_DEV_STATE_VALID		(1 << (7 - 1))

#define TSA_INTRG_FLAGS_OP_STATE_VALID		(1 << (7 - 2))



/**

 * struct tsa_intrg - Interrogate Transport-Status Area (Intrg. TSA)
@@ -140,10 +140,10 @@ struct tsa_intrg { 
#define TSB_FORMAT_DDPC		2

#define TSB_FORMAT_INTRG	3



#define TSB_FLAGS_DCW_OFFSET_VALID	1 << (7 - 0)

#define TSB_FLAGS_COUNT_VALID		1 << (7 - 1)

#define TSB_FLAGS_CACHE_MISS		1 << (7 - 2)

#define TSB_FLAGS_TIME_VALID		1 << (7 - 3)

#define TSB_FLAGS_DCW_OFFSET_VALID	(1 << (7 - 0))

#define TSB_FLAGS_COUNT_VALID		(1 << (7 - 1))

#define TSB_FLAGS_CACHE_MISS		(1 << (7 - 2))

#define TSB_FLAGS_TIME_VALID		(1 << (7 - 3))

#define TSB_FLAGS_FORMAT(x)		((x) & 7)

#define TSB_FORMAT(t)			((t)->flags & 7)
@@ -179,9 +179,9 @@ struct tsb { 
#define DCW_INTRG_RCQ_PRIMARY		1

#define DCW_INTRG_RCQ_SECONDARY		2



#define DCW_INTRG_FLAGS_MPM		1 < (7 - 0)

#define DCW_INTRG_FLAGS_PPR		1 < (7 - 1)

#define DCW_INTRG_FLAGS_CRIT		1 < (7 - 2)

#define DCW_INTRG_FLAGS_MPM		(1 << (7 - 0))

#define DCW_INTRG_FLAGS_PPR		(1 << (7 - 1))

#define DCW_INTRG_FLAGS_CRIT		(1 << (7 - 2))



/**

 * struct dcw_intrg_data - Interrogate DCW data
@@ -216,7 +216,7 @@ struct dcw_intrg_data { 
	u8  prog_data[0];

} __attribute__ ((packed));



#define DCW_FLAGS_CC		1 << (7 - 1)

#define DCW_FLAGS_CC		(1 << (7 - 1))



#define DCW_CMD_WRITE		0x01

#define DCW_CMD_READ		0x02