Commit 03a12310 authored by Jayamohan Kallickal's avatar Jayamohan Kallickal Committed by James Bottomley
Browse files

[SCSI] be2iscsi: Fixing the return type of functions 



Fixing some functions return values that did not match with
the possible return values

Signed-off-by: default avatarJayamohan Kallickal <jayamohank@serverengines.com>
Reviewed-by: default avatarMike Christie <michaelc@cs.wisc.edu>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent d3ad2bb3

drivers/scsi/be2iscsi/be_cmds.h

+1 −1
Original line number Diff line number Diff line
@@ -423,7 +423,7 @@ int beiscsi_cmd_mccq_create(struct beiscsi_hba *phba, 
			struct be_queue_info *cq);



int be_poll_mcc(struct be_ctrl_info *ctrl);

unsigned char mgmt_check_supported_fw(struct be_ctrl_info *ctrl,

int mgmt_check_supported_fw(struct be_ctrl_info *ctrl,

				      struct beiscsi_hba *phba);

unsigned int be_cmd_get_mac_addr(struct beiscsi_hba *phba);

void free_mcc_tag(struct be_ctrl_info *ctrl, unsigned int tag);

drivers/scsi/be2iscsi/be_main.c

+1 −1
Original line number Diff line number Diff line
@@ -3295,7 +3295,7 @@ static void hwi_purge_eq(struct beiscsi_hba *phba) 


static void beiscsi_clean_port(struct beiscsi_hba *phba)

{

	unsigned char mgmt_status;

	int mgmt_status;



	mgmt_status = mgmt_epfw_cleanup(phba, CMD_CONNECTION_CHUTE_0);

	if (mgmt_status)

drivers/scsi/be2iscsi/be_mgmt.c

+6 −7
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
#include "be_mgmt.h"

#include "be_iscsi.h"



unsigned char mgmt_get_fw_config(struct be_ctrl_info *ctrl,

int mgmt_get_fw_config(struct be_ctrl_info *ctrl,

				struct beiscsi_hba *phba)

{

	struct be_mcc_wrb *wrb = wrb_from_mbox(&ctrl->mbox_mem);
@@ -65,7 +65,7 @@ unsigned char mgmt_get_fw_config(struct be_ctrl_info *ctrl, 
	return status;

}



unsigned char mgmt_check_supported_fw(struct be_ctrl_info *ctrl,

int mgmt_check_supported_fw(struct be_ctrl_info *ctrl,

				      struct beiscsi_hba *phba)

{

	struct be_dma_mem nonemb_cmd;
@@ -117,8 +117,7 @@ unsigned char mgmt_check_supported_fw(struct be_ctrl_info *ctrl, 
	return status;

}





unsigned char mgmt_epfw_cleanup(struct beiscsi_hba *phba, unsigned short chute)

int mgmt_epfw_cleanup(struct beiscsi_hba *phba, unsigned short chute)

{

	struct be_ctrl_info *ctrl = &phba->ctrl;

	struct be_mcc_wrb *wrb = wrb_from_mccq(phba);
@@ -144,7 +143,7 @@ unsigned char mgmt_epfw_cleanup(struct beiscsi_hba *phba, unsigned short chute) 
	return status;

}



unsigned char mgmt_invalidate_icds(struct beiscsi_hba *phba,

unsigned int  mgmt_invalidate_icds(struct beiscsi_hba *phba,

				struct invalidate_command_table *inv_tbl,

				unsigned int num_invalidate, unsigned int cid)

{
@@ -202,7 +201,7 @@ unsigned char mgmt_invalidate_icds(struct beiscsi_hba *phba, 
	return tag;

}



unsigned char mgmt_invalidate_connection(struct beiscsi_hba *phba,

unsigned int mgmt_invalidate_connection(struct beiscsi_hba *phba,

					 struct beiscsi_endpoint *beiscsi_ep,

					 unsigned short cid,

					 unsigned short issue_reset,
@@ -239,7 +238,7 @@ unsigned char mgmt_invalidate_connection(struct beiscsi_hba *phba, 
	return tag;

}



unsigned char mgmt_upload_connection(struct beiscsi_hba *phba,

unsigned int mgmt_upload_connection(struct beiscsi_hba *phba,

				unsigned short cid, unsigned int upload_flag)

{

	struct be_ctrl_info *ctrl = &phba->ctrl;

drivers/scsi/be2iscsi/be_mgmt.h

+5 −5
Original line number Diff line number Diff line
@@ -86,14 +86,14 @@ struct mcc_wrb { 
	struct mcc_wrb_payload payload;

};



unsigned char mgmt_epfw_cleanup(struct beiscsi_hba *phba, unsigned short chute);

int mgmt_epfw_cleanup(struct beiscsi_hba *phba, unsigned short chute);

int mgmt_open_connection(struct beiscsi_hba *phba, struct sockaddr *dst_addr,

			 struct beiscsi_endpoint *beiscsi_ep);



unsigned char mgmt_upload_connection(struct beiscsi_hba *phba,

unsigned int mgmt_upload_connection(struct beiscsi_hba *phba,

				     unsigned short cid,

				     unsigned int upload_flag);

unsigned char mgmt_invalidate_icds(struct beiscsi_hba *phba,

unsigned int mgmt_invalidate_icds(struct beiscsi_hba *phba,

				struct invalidate_command_table *inv_tbl,

				unsigned int num_invalidate, unsigned int cid);
@@ -237,10 +237,10 @@ struct beiscsi_endpoint { 
	u16 cid_vld;

};



unsigned char mgmt_get_fw_config(struct be_ctrl_info *ctrl,

int mgmt_get_fw_config(struct be_ctrl_info *ctrl,

				 struct beiscsi_hba *phba);



unsigned char mgmt_invalidate_connection(struct beiscsi_hba *phba,

unsigned int mgmt_invalidate_connection(struct beiscsi_hba *phba,

					 struct beiscsi_endpoint *beiscsi_ep,

					 unsigned short cid,

					 unsigned short issue_reset,