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

Commit f1138a84 authored by Hannes Reinecke's avatar Hannes Reinecke Committed by James Bottomley
Browse files

advansys: remove 'ERR' definition 



Signed-off-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarJames Bottomley <JBottomley@Odin.com>
parent ae26759e

drivers/scsi/advansys.c

+5 −6
Original line number Diff line number Diff line
@@ -78,7 +78,6 @@ 


typedef unsigned char uchar;



#define ERR      (-1)

#define UW_ERR   (uint)(0xFFFF)

#define isodd_word(val)   ((((uint)val) & (uint)0x0001) != 0)
@@ -7307,7 +7306,7 @@ static int AscISR(ASC_DVC_VAR *asc_dvc) 
		AscAckInterrupt(iop_base);

		int_pending = ASC_TRUE;

		if ((chipstat & CSW_HALTED) && (ctrl_reg & CC_SINGLE_STEP)) {

			if (AscIsrChipHalted(asc_dvc) == ERR) {

			if (AscIsrChipHalted(asc_dvc) == ASC_ERROR) {

				goto ISR_REPORT_QDONE_FATAL_ERROR;

			} else {

				saved_ctrl_reg &= (uchar)(~CC_HALT);
@@ -8437,7 +8436,7 @@ static int AscExeScsiQueue(ASC_DVC_VAR *asc_dvc, ASC_SCSI_Q *scsiq) 
	iop_base = asc_dvc->iop_base;

	sg_head = scsiq->sg_head;

	if (asc_dvc->err_code != 0)

		return (ERR);

		return ASC_ERROR;

	scsiq->q1.q_no = 0;

	if ((scsiq->q2.tag_code & ASC_TAG_FLAG_EXTRA_BYTES) == 0) {

		scsiq->q1.extra_bytes = 0;
@@ -8463,18 +8462,18 @@ static int AscExeScsiQueue(ASC_DVC_VAR *asc_dvc, ASC_SCSI_Q *scsiq) 
	}

	if (asc_dvc->in_critical_cnt != 0) {

		AscSetLibErrorCode(asc_dvc, ASCQ_ERR_CRITICAL_RE_ENTRY);

		return (ERR);

		return ASC_ERROR;

	}

	asc_dvc->in_critical_cnt++;

	if ((scsiq->q1.cntl & QC_SG_HEAD) != 0) {

		if ((sg_entry_cnt = sg_head->entry_cnt) == 0) {

			asc_dvc->in_critical_cnt--;

			return (ERR);

			return ASC_ERROR;

		}

#if !CC_VERY_LONG_SG_LIST

		if (sg_entry_cnt > ASC_MAX_SG_LIST) {

			asc_dvc->in_critical_cnt--;

			return (ERR);

			return ASC_ERROR;

		}

#endif /* !CC_VERY_LONG_SG_LIST */

		if (sg_entry_cnt == 1) {