Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5929faf3 authored by Darrick J. Wong's avatar Darrick J. Wong Committed by James Bottomley
Browse files

[SCSI] libsas: Convert sas_proto users to sas_protocol 



sparse complains about the mixing of enums in libsas.  Since the
underlying numeric values of both enums are the same, combine them
to get rid of the warning.

Signed-off-by: default avatarDarrick J. Wong <djwong@us.ibm.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent e5a69e27

drivers/scsi/aic94xx/aic94xx_dev.c

+3 −3
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ static int asd_init_target_ddb(struct domain_device *dev) 
	if (dev->port->oob_mode != SATA_OOB_MODE) {

		flags |= OPEN_REQUIRED;

		if ((dev->dev_type == SATA_DEV) ||

		    (dev->tproto & SAS_PROTO_STP)) {

		    (dev->tproto & SAS_PROTOCOL_STP)) {

			struct smp_resp *rps_resp = &dev->sata_dev.rps_resp;

			if (rps_resp->frame_type == SMP_RESPONSE &&

			    rps_resp->function == SMP_REPORT_PHY_SATA &&
@@ -193,7 +193,7 @@ static int asd_init_target_ddb(struct domain_device *dev) 
	asd_ddbsite_write_byte(asd_ha, ddb, DDB_TARG_FLAGS, flags);



	flags = 0;

	if (dev->tproto & SAS_PROTO_STP)

	if (dev->tproto & SAS_PROTOCOL_STP)

		flags |= STP_CL_POL_NO_TX;

	asd_ddbsite_write_byte(asd_ha, ddb, DDB_TARG_FLAGS2, flags);
@@ -201,7 +201,7 @@ static int asd_init_target_ddb(struct domain_device *dev) 
	asd_ddbsite_write_word(asd_ha, ddb, SEND_QUEUE_TAIL, 0xFFFF);

	asd_ddbsite_write_word(asd_ha, ddb, SISTER_DDB, 0xFFFF);



	if (dev->dev_type == SATA_DEV || (dev->tproto & SAS_PROTO_STP)) {

	if (dev->dev_type == SATA_DEV || (dev->tproto & SAS_PROTOCOL_STP)) {

		i = asd_init_sata(dev);

		if (i < 0) {

			asd_free_ddb(asd_ha, ddb);

drivers/scsi/aic94xx/aic94xx_dump.c

+2 −2
Original line number Diff line number Diff line
@@ -903,11 +903,11 @@ void asd_dump_frame_rcvd(struct asd_phy *phy, 
	int i;



	switch ((dl->status_block[1] & 0x70) >> 3) {

	case SAS_PROTO_STP:

	case SAS_PROTOCOL_STP:

		ASD_DPRINTK("STP proto device-to-host FIS:\n");

		break;

	default:

	case SAS_PROTO_SSP:

	case SAS_PROTOCOL_SSP:

		ASD_DPRINTK("SAS proto IDENTIFY:\n");

		break;

	}

drivers/scsi/aic94xx/aic94xx_hwi.c

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ static int asd_init_phy(struct asd_phy *phy) 


	sas_phy->enabled = 1;

	sas_phy->class = SAS;

	sas_phy->iproto = SAS_PROTO_ALL;

	sas_phy->iproto = SAS_PROTOCOL_ALL;

	sas_phy->tproto = 0;

	sas_phy->type = PHY_TYPE_PHYSICAL;

	sas_phy->role = PHY_ROLE_INITIATOR;

drivers/scsi/aic94xx/aic94xx_scb.c

+3 −3
Original line number Diff line number Diff line
@@ -788,12 +788,12 @@ void asd_build_control_phy(struct asd_ascb *ascb, int phy_id, u8 subfunc) 


		/* initiator port settings are in the hi nibble */

		if (phy->sas_phy.role == PHY_ROLE_INITIATOR)

			control_phy->port_type = SAS_PROTO_ALL << 4;

			control_phy->port_type = SAS_PROTOCOL_ALL << 4;

		else if (phy->sas_phy.role == PHY_ROLE_TARGET)

			control_phy->port_type = SAS_PROTO_ALL;

			control_phy->port_type = SAS_PROTOCOL_ALL;

		else

			control_phy->port_type =

				(SAS_PROTO_ALL << 4) | SAS_PROTO_ALL;

				(SAS_PROTOCOL_ALL << 4) | SAS_PROTOCOL_ALL;



		/* link reset retries, this should be nominal */

		control_phy->link_reset_retries = 10;

drivers/scsi/aic94xx/aic94xx_task.c

+15 −15
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ static void asd_get_response_tasklet(struct asd_ascb *ascb, 
	ts->buf_valid_size = 0;

	edb = asd_ha->seq.edb_arr[edb_id + escb->edb_index];

	r = edb->vaddr;

	if (task->task_proto == SAS_PROTO_SSP) {

	if (task->task_proto == SAS_PROTOCOL_SSP) {

		struct ssp_response_iu *iu =

			r + 16 + sizeof(struct ssp_frame_hdr);
@@ -341,14 +341,14 @@ static void asd_task_tasklet_complete(struct asd_ascb *ascb, 
	}



	switch (task->task_proto) {

	case SATA_PROTO:

	case SAS_PROTO_STP:

	case SAS_PROTOCOL_SATA:

	case SAS_PROTOCOL_STP:

		asd_unbuild_ata_ascb(ascb);

		break;

	case SAS_PROTO_SMP:

	case SAS_PROTOCOL_SMP:

		asd_unbuild_smp_ascb(ascb);

		break;

	case SAS_PROTO_SSP:

	case SAS_PROTOCOL_SSP:

		asd_unbuild_ssp_ascb(ascb);

	default:

		break;
@@ -586,17 +586,17 @@ int asd_execute_task(struct sas_task *task, const int num, 
	list_for_each_entry(a, &alist, list) {

		t = a->uldd_task;

		a->uldd_timer = 1;

		if (t->task_proto & SAS_PROTO_STP)

			t->task_proto = SAS_PROTO_STP;

		if (t->task_proto & SAS_PROTOCOL_STP)

			t->task_proto = SAS_PROTOCOL_STP;

		switch (t->task_proto) {

		case SATA_PROTO:

		case SAS_PROTO_STP:

		case SAS_PROTOCOL_SATA:

		case SAS_PROTOCOL_STP:

			res = asd_build_ata_ascb(a, t, gfp_flags);

			break;

		case SAS_PROTO_SMP:

		case SAS_PROTOCOL_SMP:

			res = asd_build_smp_ascb(a, t, gfp_flags);

			break;

		case SAS_PROTO_SSP:

		case SAS_PROTOCOL_SSP:

			res = asd_build_ssp_ascb(a, t, gfp_flags);

			break;

		default:
@@ -633,14 +633,14 @@ int asd_execute_task(struct sas_task *task, const int num, 
			t->task_state_flags &= ~SAS_TASK_AT_INITIATOR;

			spin_unlock_irqrestore(&t->task_state_lock, flags);

			switch (t->task_proto) {

			case SATA_PROTO:

			case SAS_PROTO_STP:

			case SAS_PROTOCOL_SATA:

			case SAS_PROTOCOL_STP:

				asd_unbuild_ata_ascb(a);

				break;

			case SAS_PROTO_SMP:

			case SAS_PROTOCOL_SMP:

				asd_unbuild_smp_ascb(a);

				break;

			case SAS_PROTO_SSP:

			case SAS_PROTOCOL_SSP:

				asd_unbuild_ssp_ascb(a);

			default:

				break;