Re: [PATCH 18/20] libfc: Replace ->seq_set_resp callback with direct function call

[Johannes Thumshirn]

On Tue, Oct 18, 2016 at 10:01:52AM +0200, Hannes Reinecke wrote:
> The ->seq_set_resp callback only ever had one implementation,
> so call it directly and drop the callback.
> 
> Signed-off-by: Hannes Reinecke 
> ---

Looks good,
Acked-by: Johannes Thumshirn 

-- 
Johannes Thumshirn  Storage
jthumsh...@suse.de+49 911 74053 689
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: Felix Imendörffer, Jane Smithard, Graham Norton
HRB 21284 (AG Nürnberg)
Key fingerprint = EC38 9CAB C2C4 F25D 8600 D0D0 0393 969D 2D76 0850
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 18/20] libfc: Replace ->seq_set_resp callback with direct function call

[Hannes Reinecke]

The ->seq_set_resp callback only ever had one implementation,
so call it directly and drop the callback.

Signed-off-by: Hannes Reinecke 
---
 drivers/scsi/libfc/fc_exch.c| 11 ---
 drivers/target/tcm_fc/tfc_cmd.c |  2 +-
 include/scsi/libfc.h| 13 +++--
 3 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/drivers/scsi/libfc/fc_exch.c b/drivers/scsi/libfc/fc_exch.c
index 8a99f84..ceeccd7 100644
--- a/drivers/scsi/libfc/fc_exch.c
+++ b/drivers/scsi/libfc/fc_exch.c
@@ -602,10 +602,9 @@ struct fc_seq *fc_seq_start_next(struct fc_seq *sp)
  *
  * Note: May sleep if invoked from outside a response handler.
  */
-static void fc_seq_set_resp(struct fc_seq *sp,
-   void (*resp)(struct fc_seq *, struct fc_frame *,
-void *),
-   void *arg)
+void fc_seq_set_resp(struct fc_seq *sp,
+void (*resp)(struct fc_seq *, struct fc_frame *, void *),
+void *arg)
 {
struct fc_exch *ep = fc_seq_exch(sp);
DEFINE_WAIT(wait);
@@ -624,6 +623,7 @@ static void fc_seq_set_resp(struct fc_seq *sp,
ep->arg = arg;
spin_unlock_bh(>ex_lock);
 }
+EXPORT_SYMBOL(fc_seq_set_resp);
 
 /**
  * fc_exch_abort_locked() - Abort an exchange
@@ -2650,9 +2650,6 @@ void fc_exch_recv(struct fc_lport *lport, struct fc_frame 
*fp)
  */
 int fc_exch_init(struct fc_lport *lport)
 {
-   if (!lport->tt.seq_set_resp)
-   lport->tt.seq_set_resp = fc_seq_set_resp;
-
if (!lport->tt.exch_mgr_reset)
lport->tt.exch_mgr_reset = fc_exch_mgr_reset;
 
diff --git a/drivers/target/tcm_fc/tfc_cmd.c b/drivers/target/tcm_fc/tfc_cmd.c
index bf6ab3f..6029b90 100644
--- a/drivers/target/tcm_fc/tfc_cmd.c
+++ b/drivers/target/tcm_fc/tfc_cmd.c
@@ -563,7 +563,7 @@ static void ft_send_work(struct work_struct *work)
task_attr = TCM_SIMPLE_TAG;
}
 
-   fc_seq_exch(cmd->seq)->lp->tt.seq_set_resp(cmd->seq, ft_recv_seq, cmd);
+   fc_seq_set_resp(cmd->seq, ft_recv_seq, cmd);
cmd->se_cmd.tag = fc_seq_exch(cmd->seq)->rxid;
/*
 * Use a single se_cmd->cmd_kref as we expect to release se_cmd
diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h
index 39143ca..e8669f9 100644
--- a/include/scsi/libfc.h
+++ b/include/scsi/libfc.h
@@ -515,16 +515,6 @@ struct libfc_function_template {
void (*get_lesb)(struct fc_lport *, struct fc_els_lesb *lesb);
 
/*
-* Set a response handler for the exchange of the sequence.
-*
-* STATUS: OPTIONAL
-*/
-   void (*seq_set_resp)(struct fc_seq *sp,
-void (*resp)(struct fc_seq *, struct fc_frame *,
- void *),
-void *arg);
-
-   /*
 * Assign a sequence for an incoming request frame.
 *
 * STATUS: OPTIONAL
@@ -1013,6 +1003,9 @@ struct fc_seq *fc_exch_seq_send(struct fc_lport *lport,
 void fc_seq_els_rsp_send(struct fc_frame *, enum fc_els_cmd,
 struct fc_seq_els_data *);
 struct fc_seq *fc_seq_start_next(struct fc_seq *sp);
+void fc_seq_set_resp(struct fc_seq *sp,
+void (*resp)(struct fc_seq *, struct fc_frame *, void *),
+void *arg);
 struct fc_exch_mgr_anchor *fc_exch_mgr_add(struct fc_lport *,
   struct fc_exch_mgr *,
   bool (*match)(struct fc_frame *));
-- 
1.8.5.6

--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html