diff --git a/drivers/s390/char/tape_std.h b/drivers/s390/char/tape_std.h
index 580241866d9e..c2da50a6a133 100644
--- a/drivers/s390/char/tape_std.h
+++ b/drivers/s390/char/tape_std.h
@@ -19,53 +19,25 @@
 /*
  * The CCW commands for the Tape type of command.
  */
-#define INVALID_00		0x00	/* Invalid cmd */
 #define BACKSPACEBLOCK		0x27	/* Back Space block */
 #define BACKSPACEFILE		0x2f	/* Back Space file */
 #define DATA_SEC_ERASE		0x97	/* Data security erase */
 #define ERASE_GAP		0x17	/* Erase Gap */
 #define FORSPACEBLOCK		0x37	/* Forward space block */
 #define FORSPACEFILE		0x3F	/* Forward Space file */
-#define FORCE_STREAM_CNT	0xEB	/* Forced streaming count # */
 #define NOP			0x03	/* No operation	*/
 #define READ_FORWARD		0x02	/* Read forward */
 #define REWIND			0x07	/* Rewind */
 #define REWIND_UNLOAD		0x0F	/* Rewind and Unload */
 #define SENSE			0x04	/* Sense */
-#define NEW_MODE_SET		0xEB	/* Guess it is Mode set */
 #define WRITE_CMD		0x01	/* Write */
 #define WRITETAPEMARK		0x1F	/* Write Tape Mark */
 
-#define ASSIGN			0xB7	/* 3420 REJECT,3480 OK	*/
-#define CONTROL_ACCESS		0xE3	/* Set high speed */
-#define DIAG_MODE_SET		0x0B	/* 3420 NOP, 3480 REJECT */
-#define LOCATE			0x4F	/* 3420 REJ, 3480 NOP */
-#define LOOP_WRITE_TO_READ	0x8B	/* 3480 REJECT */
-#define MODE_SET_DB		0xDB	/* 3420 REJECT,3480 OK */
-#define MODE_SET_C3		0xC3	/* for 3420 */
-#define MODE_SET_CB		0xCB	/* for 3420 */
-#define MODE_SET_D3		0xD3	/* for 3420 */
-#define READ_BACKWARD		0x0C	/* */
-#define READ_BLOCK_ID		0x22	/* 3420 REJECT,3480 OK */
-#define READ_BUFFER		0x12	/* 3420 REJECT,3480 OK */
-#define READ_BUFF_LOG		0x24	/* 3420 REJECT,3480 OK */
-#define RELEASE			0xD4	/* 3420 NOP, 3480 REJECT */
-#define REQ_TRK_IN_ERROR	0x1B	/* 3420 NOP, 3480 REJECT */
-#define RESERVE			0xF4	/* 3420 NOP, 3480 REJECT */
-#define SENSE_GROUP_ID		0x34	/* 3420 REJECT,3480 OK */
-#define SENSE_ID		0xE4	/* 3420 REJECT,3480 OK */
-#define READ_DEV_CHAR		0x64	/* Read device characteristics */
-#define SET_DIAGNOSE		0x4B	/* 3420 NOP, 3480 REJECT */
-#define SET_GROUP_ID		0xAF	/* 3420 REJECT,3480 OK */
-#define SET_TAPE_WRITE_IMMED	0xC3	/* for 3480 */
-#define SUSPEND			0x5B	/* 3420 REJ, 3480 NOP */
-#define SYNC			0x43	/* Synchronize (flush buffer) */
-#define UNASSIGN		0xC7	/* 3420 REJECT,3480 OK */
-#define PERF_SUBSYS_FUNC	0x77	/* 3490 CMD */
-#define READ_CONFIG_DATA	0xFA	/* 3490 CMD */
-#define READ_MESSAGE_ID		0x4E	/* 3490 CMD */
-#define READ_SUBSYS_DATA	0x3E	/* 3490 CMD */
-#define SET_INTERFACE_ID	0x73	/* 3490 CMD */
+#define ASSIGN			0xB7	/* Assign */
+#define LOCATE			0x4F	/* Locate Block */
+#define MODE_SET_DB		0xDB	/* Mode Set */
+#define READ_BLOCK_ID		0x22	/* Read Block ID */
+#define UNASSIGN		0xC7	/* Unassign */
 
 #define SENSE_COMMAND_REJECT		0x80
 #define SENSE_INTERVENTION_REQUIRED	0x40