Commit 234d6778 authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Christoph Hellwig
Browse files

scsi: merge print_opcode_name() 



Instead of having two versions of print_opcode_name() we
should be consolidating them into one version.

Signed-off-by: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarRobert Elliott <elliott@hp.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 6033f979

drivers/scsi/constants.c

+38 −60
Original line number Diff line number Diff line
@@ -30,6 +30,16 @@ 
#define THIRD_PARTY_COPY_IN 0x84





struct sa_name_list {

	int opcode;

	const struct value_name_pair *arr;

	int arr_sz;

};



struct value_name_pair {

	int value;

	const char * name;

};



#ifdef CONFIG_SCSI_CONSTANTS

static const char * cdb_byte0_names[] = {
@@ -102,11 +112,6 @@ static const char * cdb_byte0_names[] = { 
            "Volume set (out), Send DVD structure",

};



struct value_name_pair {

	int value;

	const char * name;

};



static const struct value_name_pair maint_in_arr[] = {

	{0x5, "Report identifying information"},

	{0xa, "Report target port groups"},
@@ -244,12 +249,6 @@ static const struct value_name_pair variable_length_arr[] = { 
};

#define VARIABLE_LENGTH_SZ ARRAY_SIZE(variable_length_arr)



struct sa_name_list {

	int opcode;

	const struct value_name_pair *arr;

	int arr_sz;

};



static struct sa_name_list sa_names_arr[] = {

	{VARIABLE_LENGTH_CMD, variable_length_arr, VARIABLE_LENGTH_SZ},

	{MAINTENANCE_IN, maint_in_arr, MAINT_IN_SZ},
@@ -266,6 +265,26 @@ static struct sa_name_list sa_names_arr[] = { 
	{0, NULL, 0},

};



#else /* ifndef CONFIG_SCSI_CONSTANTS */

static const char *cdb_byte0_names[];



static struct sa_name_list sa_names_arr[] = {

	{VARIABLE_LENGTH_CMD, NULL, 0},

	{MAINTENANCE_IN, NULL, 0},

	{MAINTENANCE_OUT, NULL, 0},

	{PERSISTENT_RESERVE_IN, NULL, 0},

	{PERSISTENT_RESERVE_OUT, NULL, 0},

	{SERVICE_ACTION_IN_12, NULL, 0},

	{SERVICE_ACTION_OUT_12, NULL, 0},

	{SERVICE_ACTION_BIDIRECTIONAL, NULL, 0},

	{SERVICE_ACTION_IN_16, NULL, 0},

	{SERVICE_ACTION_OUT_16, NULL, 0},

	{THIRD_PARTY_COPY_IN, NULL, 0},

	{THIRD_PARTY_COPY_OUT, NULL, 0},

	{0, NULL, 0},

};

#endif /* CONFIG_SCSI_CONSTANTS */



static bool scsi_opcode_sa_name(int opcode, int service_action,

				const char **sa_name)

{
@@ -315,11 +334,14 @@ static void print_opcode_name(unsigned char * cdbp, int cdb_len) 


	if (!scsi_opcode_sa_name(cdb0, sa, &name)) {

		if (cdb0 < 0xc0) {

			if (ARRAY_SIZE(cdb_byte0_names) > 1) {

				name = cdb_byte0_names[cdb0];

				if (name)

					printk("%s", name);

				else

					printk("cdb[0]=0x%x (reserved)", cdb0);

			} else

				printk("cdb[0]=0x%x", cdb0);

		} else

			printk("cdb[0]=0x%x (vendor)", cdb0);

	} else {
@@ -333,50 +355,6 @@ static void print_opcode_name(unsigned char * cdbp, int cdb_len) 
	}

}



#else /* ifndef CONFIG_SCSI_CONSTANTS */



static void print_opcode_name(unsigned char * cdbp, int cdb_len)

{

	int sa, len, cdb0;



	cdb0 = cdbp[0];

	switch(cdb0) {

	case VARIABLE_LENGTH_CMD:

		len = scsi_varlen_cdb_length(cdbp);

		if (len < 10) {

			printk("short opcode=0x%x command, len=%d "

			       "ext_len=%d", cdb0, len, cdb_len);

			break;

		}

		sa = (cdbp[8] << 8) + cdbp[9];

		printk("cdb[0]=0x%x, sa=0x%x", cdb0, sa);

		if (len != cdb_len)

			printk(", in_cdb_len=%d, ext_len=%d", len, cdb_len);

		break;

	case MAINTENANCE_IN:

	case MAINTENANCE_OUT:

	case PERSISTENT_RESERVE_IN:

	case PERSISTENT_RESERVE_OUT:

	case SERVICE_ACTION_IN_12:

	case SERVICE_ACTION_OUT_12:

	case SERVICE_ACTION_BIDIRECTIONAL:

	case SERVICE_ACTION_IN_16:

	case SERVICE_ACTION_OUT_16:

	case THIRD_PARTY_COPY_IN:

	case THIRD_PARTY_COPY_OUT:

		sa = cdbp[1] & 0x1f;

		printk("cdb[0]=0x%x, sa=0x%x", cdb0, sa);

		break;

	default:

		if (cdb0 < 0xc0)

			printk("cdb[0]=0x%x", cdb0);

		else

			printk("cdb[0]=0x%x (vendor)", cdb0);

		break;

	}

}

#endif



void __scsi_print_command(unsigned char *cdb)

{

	int k, len;