* [PATCH 03/20] be2iscsi: Fixing the return type of functions
@ 2010-07-12 17:50 Jayamohan Kallickal
2010-07-13 7:29 ` Mike Christie
0 siblings, 1 reply; 3+ messages in thread
From: Jayamohan Kallickal @ 2010-07-12 17:50 UTC (permalink / raw)
To: linux-scsi; +Cc: James.Bottomley, michaelc
Fixing some functions return values that did not match with
the possible return values
Signed-off-by: Jayamohan Kallickal <jayamohank@serverengines.com>
---
drivers/scsi/be2iscsi/be_cmds.h | 2 +-
drivers/scsi/be2iscsi/be_mgmt.c | 13 ++++++-------
drivers/scsi/be2iscsi/be_mgmt.h | 10 +++++-----
3 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/drivers/scsi/be2iscsi/be_cmds.h b/drivers/scsi/be2iscsi/be_cmds.h
index f94df6c..30a293f 100644
--- a/drivers/scsi/be2iscsi/be_cmds.h
+++ b/drivers/scsi/be2iscsi/be_cmds.h
@@ -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);
diff --git a/drivers/scsi/be2iscsi/be_mgmt.c b/drivers/scsi/be2iscsi/be_mgmt.c
index ff8b1cd..dcb70fa 100644
--- a/drivers/scsi/be2iscsi/be_mgmt.c
+++ b/drivers/scsi/be2iscsi/be_mgmt.c
@@ -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;
diff --git a/drivers/scsi/be2iscsi/be_mgmt.h b/drivers/scsi/be2iscsi/be_mgmt.h
index 3d316b8..74b885a 100644
--- a/drivers/scsi/be2iscsi/be_mgmt.h
+++ b/drivers/scsi/be2iscsi/be_mgmt.h
@@ -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,
--
1.6.5.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 03/20] be2iscsi: Fixing the return type of functions
2010-07-12 17:50 [PATCH 03/20] be2iscsi: Fixing the return type of functions Jayamohan Kallickal
@ 2010-07-13 7:29 ` Mike Christie
2010-07-13 7:33 ` Mike Christie
0 siblings, 1 reply; 3+ messages in thread
From: Mike Christie @ 2010-07-13 7:29 UTC (permalink / raw)
To: Jayamohan Kalickal; +Cc: linux-scsi, James.Bottomley
On 07/12/2010 12:50 PM, Jayamohan Kallickal wrote:
> -
> -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;
> }
>
You forgot to change the caller of this function.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 03/20] be2iscsi: Fixing the return type of functions
2010-07-13 7:29 ` Mike Christie
@ 2010-07-13 7:33 ` Mike Christie
0 siblings, 0 replies; 3+ messages in thread
From: Mike Christie @ 2010-07-13 7:33 UTC (permalink / raw)
To: Jayamohan Kalickal; +Cc: linux-scsi, James.Bottomley
On 07/13/2010 02:29 AM, Mike Christie wrote:
> On 07/12/2010 12:50 PM, Jayamohan Kallickal wrote:
>> -
>> -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;
>> }
>>
>
> You forgot to change the caller of this function.
Nevermind. I see you fixed it up in a later patch. Next time, just
include both in the one patch since they go together.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-07-13 7:29 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-07-12 17:50 [PATCH 03/20] be2iscsi: Fixing the return type of functions Jayamohan Kallickal
2010-07-13 7:29 ` Mike Christie
2010-07-13 7:33 ` Mike Christie
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).