Changing all Upper Blocks' repsonse handlers to be-
fc_<UB>_<cmd>_resp()
Signed-off-by: Robert Love <[EMAIL PROTECTED]>
---
drivers/scsi/libfc/fc_fcp.c | 8 ++++---
drivers/scsi/libfc/fc_rport.c | 44 +++++++++++++++++++++--------------------
2 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/drivers/scsi/libfc/fc_fcp.c b/drivers/scsi/libfc/fc_fcp.c
index a5f7aba..43bd438 100644
--- a/drivers/scsi/libfc/fc_fcp.c
+++ b/drivers/scsi/libfc/fc_fcp.c
@@ -138,7 +138,7 @@ struct fc_fcp_internal {
*/
static void fc_fcp_recv_data(struct fc_fcp_pkt *, struct fc_frame *);
static void fc_fcp_recv(struct fc_seq *, struct fc_frame *, void *);
-static void fc_fcp_fcp_resp(struct fc_fcp_pkt *, struct fc_frame *);
+static void fc_fcp_resp(struct fc_fcp_pkt *, struct fc_frame *);
static void fc_fcp_complete(struct fc_fcp_pkt *);
static void fc_tm_done(struct fc_seq *, struct fc_frame *, void *);
static void fc_fcp_error(struct fc_fcp_pkt *fsp, struct fc_frame *fp);
@@ -648,7 +648,7 @@ static void fc_fcp_recv(struct fc_seq *sp, struct fc_frame
*fp, void *arg)
} else if (r_ctl == FC_RCTL_DD_CMD_STATUS) {
WARN_ON(fr_flags(fp) & FCPHF_CRC_UNCHECKED);
- fc_fcp_fcp_resp(fsp, fp);
+ fc_fcp_resp(fsp, fp);
} else {
FC_DBG("unexpected frame. r_ctl %x\n", r_ctl);
}
@@ -660,7 +660,7 @@ errout:
fc_fcp_error(fsp, fp);
}
-static void fc_fcp_fcp_resp(struct fc_fcp_pkt *fsp, struct fc_frame *fp)
+static void fc_fcp_resp(struct fc_fcp_pkt *fsp, struct fc_frame *fp)
{
struct fc_frame_header *fh;
struct fcp_resp *fc_rp;
@@ -1189,7 +1189,7 @@ static void fc_tm_done(struct fc_seq *sp, struct fc_frame
*fp, void *arg)
return;
}
- fc_fcp_fcp_resp(fsp, fp);
+ fc_fcp_resp(fsp, fp);
fsp->seq_ptr = NULL;
fsp->lp->tt.exch_done(sp);
fc_frame_free(fp);
diff --git a/drivers/scsi/libfc/fc_rport.c b/drivers/scsi/libfc/fc_rport.c
index 3ea9f26..f751f0e 100644
--- a/drivers/scsi/libfc/fc_rport.c
+++ b/drivers/scsi/libfc/fc_rport.c
@@ -496,8 +496,8 @@ static void fc_rport_error(struct fc_rport *rport, struct
fc_frame *fp)
* @fp: response frame
* @rp_arg: Fibre Channel remote port
*/
-static void fc_rport_plogi_recv_resp(struct fc_seq *sp, struct fc_frame *fp,
- void *rp_arg)
+static void fc_rport_plogi_resp(struct fc_seq *sp, struct fc_frame *fp,
+ void *rp_arg)
{
struct fc_els_ls_rjt *rjp;
struct fc_els_flogi *plp;
@@ -573,22 +573,22 @@ static void fc_rport_enter_plogi(struct fc_rport *rport)
rp->e_d_tov = lp->e_d_tov;
fc_frame_setup(fp, FC_RCTL_ELS_REQ, FC_TYPE_ELS);
if (!lp->tt.exch_seq_send(lp, fp,
- fc_rport_plogi_recv_resp,
- rport, lp->e_d_tov,
- rp->local_port->fid,
- rport->port_id,
- FC_FC_SEQ_INIT | FC_FC_END_SEQ))
+ fc_rport_plogi_resp,
+ rport, lp->e_d_tov,
+ rp->local_port->fid,
+ rport->port_id,
+ FC_FC_SEQ_INIT | FC_FC_END_SEQ))
fc_rport_retry(rport);
}
/**
- * fc_rport_prli_recv_resp - Process Login (PRLI) response handler
+ * fc_rport_prli_resp - Process Login (PRLI) response handler
* @sp: current sequence in the PRLI exchange
* @fp: response frame
* @rp_arg: Fibre Channel remote port
*/
-static void fc_rport_prli_recv_resp(struct fc_seq *sp, struct fc_frame *fp,
- void *rp_arg)
+static void fc_rport_prli_resp(struct fc_seq *sp, struct fc_frame *fp,
+ void *rp_arg)
{
struct fc_rport *rport = rp_arg;
struct fc_rport_libfc_priv *rp = rport->dd_data;
@@ -648,13 +648,13 @@ static void fc_rport_prli_recv_resp(struct fc_seq *sp,
struct fc_frame *fp,
}
/**
- * fc_rport_logo_recv_resp - Logout (LOGO) response handler
+ * fc_rport_logo_resp - Logout (LOGO) response handler
* @sp: current sequence in the LOGO exchange
* @fp: response frame
* @rp_arg: Fibre Channel remote port
*/
-static void fc_rport_logo_recv_resp(struct fc_seq *sp, struct fc_frame *fp,
- void *rp_arg)
+static void fc_rport_logo_resp(struct fc_seq *sp, struct fc_frame *fp,
+ void *rp_arg)
{
struct fc_rport *rport = rp_arg;
struct fc_rport_libfc_priv *rp = rport->dd_data;
@@ -741,7 +741,7 @@ static void fc_rport_enter_prli(struct fc_rport *rport)
pp->spp.spp_params = htonl(rp->local_port->service_params);
fc_frame_setup(fp, FC_RCTL_ELS_REQ, FC_TYPE_ELS);
if (!lp->tt.exch_seq_send(lp, fp,
- fc_rport_prli_recv_resp,
+ fc_rport_prli_resp,
rport, lp->e_d_tov,
rp->local_port->fid,
rport->port_id,
@@ -757,8 +757,8 @@ static void fc_rport_enter_prli(struct fc_rport *rport)
*
* Many targets don't seem to support this.
*/
-static void fc_rport_els_rtv_resp(struct fc_seq *sp, struct fc_frame *fp,
- void *rp_arg)
+static void fc_rport_rtv_resp(struct fc_seq *sp, struct fc_frame *fp,
+ void *rp_arg)
{
struct fc_rport *rport = rp_arg;
struct fc_rport_libfc_priv *rp = rport->dd_data;
@@ -829,7 +829,7 @@ static void fc_rport_enter_rtv(struct fc_rport *rport)
rtv->rtv_cmd = ELS_RTV;
fc_frame_setup(fp, FC_RCTL_ELS_REQ, FC_TYPE_ELS);
if (!lp->tt.exch_seq_send(lp, fp,
- fc_rport_els_rtv_resp,
+ fc_rport_rtv_resp,
rport, lp->e_d_tov,
rp->local_port->fid,
rport->port_id,
@@ -862,11 +862,11 @@ static void fc_rport_enter_logo(struct fc_rport *rport)
fc_frame_setup(fp, FC_RCTL_ELS_REQ, FC_TYPE_ELS);
if (!lp->tt.exch_seq_send(lp, fp,
- fc_rport_logo_recv_resp,
- rport, lp->e_d_tov,
- rp->local_port->fid,
- rport->port_id,
- FC_FC_SEQ_INIT | FC_FC_END_SEQ))
+ fc_rport_logo_resp,
+ rport, lp->e_d_tov,
+ rp->local_port->fid,
+ rport->port_id,
+ FC_FC_SEQ_INIT | FC_FC_END_SEQ))
fc_rport_retry(rport);
}
_______________________________________________
devel mailing list
[email protected]
http://www.open-fcoe.org/mailman/listinfo/devel
