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

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

advansys: cleanup function return codes 



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

drivers/scsi/advansys.c

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


typedef unsigned char uchar;



#define UW_ERR   (uint)(0xFFFF)

#define isodd_word(val)   ((((uint)val) & (uint)0x0001) != 0)



#define PCI_VENDOR_ID_ASP		0x10cd
@@ -3981,15 +3980,13 @@ static u32 AscMemSumLramWord(PortAddr iop_base, ushort s_addr, int words) 
	return (sum);

}



static ushort AscInitLram(ASC_DVC_VAR *asc_dvc)

static void AscInitLram(ASC_DVC_VAR *asc_dvc)

{

	uchar i;

	ushort s_addr;

	PortAddr iop_base;

	ushort warn_code;



	iop_base = asc_dvc->iop_base;

	warn_code = 0;

	AscMemWordSetLram(iop_base, ASC_QADR_BEG, 0,

			  (ushort)(((int)(asc_dvc->max_total_qng + 2 + 1) *

				    64) >> 1));
@@ -4028,7 +4025,6 @@ static ushort AscInitLram(ASC_DVC_VAR *asc_dvc) 
		AscWriteLramByte(iop_base,

				 (ushort)(s_addr + (ushort)ASC_SCSIQ_B_QNO), i);

	}

	return warn_code;

}



static u32
@@ -4087,10 +4083,10 @@ static void AscInitQLinkVar(ASC_DVC_VAR *asc_dvc) 
	}

}



static ushort AscInitMicroCodeVar(ASC_DVC_VAR *asc_dvc)

static int AscInitMicroCodeVar(ASC_DVC_VAR *asc_dvc)

{

	int i;

	ushort warn_code;

	int warn_code;

	PortAddr iop_base;

	__le32 phy_addr;

	__le32 phy_size;
@@ -4132,12 +4128,12 @@ static ushort AscInitMicroCodeVar(ASC_DVC_VAR *asc_dvc) 
	AscSetPCAddr(iop_base, ASC_MCODE_START_ADDR);

	if (AscGetPCAddr(iop_base) != ASC_MCODE_START_ADDR) {

		asc_dvc->err_code |= ASC_IERR_SET_PC_ADDR;

		warn_code = UW_ERR;

		warn_code = -EINVAL;

		goto err_mcode_start;

	}

	if (AscStartChip(iop_base) != 1) {

		asc_dvc->err_code |= ASC_IERR_START_STOP_CHIP;

		warn_code = UW_ERR;

		warn_code = -EIO;

		goto err_mcode_start;

	}
@@ -4151,13 +4147,13 @@ static ushort AscInitMicroCodeVar(ASC_DVC_VAR *asc_dvc) 
	return warn_code;

}



static ushort AscInitAsc1000Driver(ASC_DVC_VAR *asc_dvc)

static int AscInitAsc1000Driver(ASC_DVC_VAR *asc_dvc)

{

	const struct firmware *fw;

	const char fwname[] = "advansys/mcode.bin";

	int err;

	unsigned long chksum;

	ushort warn_code;

	int warn_code;

	PortAddr iop_base;



	iop_base = asc_dvc->iop_base;
@@ -4169,15 +4165,13 @@ static ushort AscInitAsc1000Driver(ASC_DVC_VAR *asc_dvc) 
	}

	asc_dvc->init_state |= ASC_INIT_STATE_BEG_LOAD_MC;

	if (asc_dvc->err_code != 0)

		return UW_ERR;

		return ASC_ERROR;

	if (!AscFindSignature(asc_dvc->iop_base)) {

		asc_dvc->err_code = ASC_IERR_BAD_SIGNATURE;

		return warn_code;

	}

	AscDisableInterrupt(iop_base);

	warn_code |= AscInitLram(asc_dvc);

	if (asc_dvc->err_code != 0)

		return UW_ERR;

	AscInitLram(asc_dvc);



	err = request_firmware(&fw, fwname, asc_dvc->drv_ptr->dev);

	if (err) {
@@ -9028,15 +9022,13 @@ static uchar AscSetIsaDmaSpeed(PortAddr iop_base, uchar speed_value) 
}

#endif /* CONFIG_ISA */



static ushort AscInitAscDvcVar(ASC_DVC_VAR *asc_dvc)

static void AscInitAscDvcVar(ASC_DVC_VAR *asc_dvc)

{

	int i;

	PortAddr iop_base;

	ushort warn_code;

	uchar chip_version;



	iop_base = asc_dvc->iop_base;

	warn_code = 0;

	asc_dvc->err_code = 0;

	if ((asc_dvc->bus_type &

	     (ASC_IS_ISA | ASC_IS_PCI | ASC_IS_EISA | ASC_IS_VL)) == 0) {
@@ -9112,7 +9104,6 @@ static ushort AscInitAscDvcVar(ASC_DVC_VAR *asc_dvc) 
		asc_dvc->scsiq_busy_tail[i] = (ASC_SCSI_Q *)0L;

		asc_dvc->cfg->max_tag_qng[i] = ASC_MAX_INRAM_TAG_QNG;

	}

	return warn_code;

}



static int AscWriteEEPCmdReg(PortAddr iop_base, uchar cmd_reg)
@@ -9378,7 +9369,7 @@ static int AscSetEEPConfig(PortAddr iop_base, ASCEEP_CONFIG *cfg_buf, 
	return n_error;

}



static ushort AscInitFromEEP(ASC_DVC_VAR *asc_dvc)

static int AscInitFromEEP(ASC_DVC_VAR *asc_dvc)

{

	ASCEEP_CONFIG eep_config_buf;

	ASCEEP_CONFIG *eep_config;
@@ -9554,8 +9545,8 @@ static int AscInitGetConfig(struct Scsi_Host *shost) 
		return asc_dvc->err_code;



	if (AscFindSignature(asc_dvc->iop_base)) {

		warn_code |= AscInitAscDvcVar(asc_dvc);

		warn_code |= AscInitFromEEP(asc_dvc);

		AscInitAscDvcVar(asc_dvc);

		warn_code = AscInitFromEEP(asc_dvc);

		asc_dvc->init_state |= ASC_INIT_STATE_END_GET_CFG;

		if (asc_dvc->scsi_reset_wait > ASC_MAX_SCSI_RESET_WAIT)

			asc_dvc->scsi_reset_wait = ASC_MAX_SCSI_RESET_WAIT;