Commit 5922a957 authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Martin K. Petersen

scsi: libfc: Replace ->rport_flush_queue callback with function call

The ->rport_flush_queue callback only ever had a single
implementation, so we can as well call it directly and
drop the callback.
Signed-off-by: default avatarHannes Reinecke <hare@suse.com>
Acked-by: default avatarJohannes Thumshirn <jth@kernel.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent e76ee65f
...@@ -2215,7 +2215,7 @@ static void fcoe_ctlr_disc_stop(struct fc_lport *lport) ...@@ -2215,7 +2215,7 @@ static void fcoe_ctlr_disc_stop(struct fc_lport *lport)
static void fcoe_ctlr_disc_stop_final(struct fc_lport *lport) static void fcoe_ctlr_disc_stop_final(struct fc_lport *lport)
{ {
fcoe_ctlr_disc_stop(lport); fcoe_ctlr_disc_stop(lport);
lport->tt.rport_flush_queue(); fc_rport_flush_queue();
synchronize_rcu(); synchronize_rcu();
} }
......
...@@ -719,7 +719,7 @@ static void fc_disc_stop(struct fc_lport *lport) ...@@ -719,7 +719,7 @@ static void fc_disc_stop(struct fc_lport *lport)
static void fc_disc_stop_final(struct fc_lport *lport) static void fc_disc_stop_final(struct fc_lport *lport)
{ {
fc_disc_stop(lport); fc_disc_stop(lport);
lport->tt.rport_flush_queue(); fc_rport_flush_queue();
} }
/** /**
......
...@@ -625,7 +625,7 @@ int fc_fabric_logoff(struct fc_lport *lport) ...@@ -625,7 +625,7 @@ int fc_fabric_logoff(struct fc_lport *lport)
if (lport->dns_rdata) if (lport->dns_rdata)
fc_rport_logoff(lport->dns_rdata); fc_rport_logoff(lport->dns_rdata);
mutex_unlock(&lport->lp_mutex); mutex_unlock(&lport->lp_mutex);
lport->tt.rport_flush_queue(); fc_rport_flush_queue();
mutex_lock(&lport->lp_mutex); mutex_lock(&lport->lp_mutex);
fc_lport_enter_logo(lport); fc_lport_enter_logo(lport);
mutex_unlock(&lport->lp_mutex); mutex_unlock(&lport->lp_mutex);
......
...@@ -2175,10 +2175,11 @@ static void fc_rport_recv_logo_req(struct fc_lport *lport, struct fc_frame *fp) ...@@ -2175,10 +2175,11 @@ static void fc_rport_recv_logo_req(struct fc_lport *lport, struct fc_frame *fp)
/** /**
* fc_rport_flush_queue() - Flush the rport_event_queue * fc_rport_flush_queue() - Flush the rport_event_queue
*/ */
static void fc_rport_flush_queue(void) void fc_rport_flush_queue(void)
{ {
flush_workqueue(rport_event_queue); flush_workqueue(rport_event_queue);
} }
EXPORT_SYMBOL(fc_rport_flush_queue);
/** /**
* fc_rport_init() - Initialize the remote port layer for a local port * fc_rport_init() - Initialize the remote port layer for a local port
...@@ -2186,9 +2187,6 @@ static void fc_rport_flush_queue(void) ...@@ -2186,9 +2187,6 @@ static void fc_rport_flush_queue(void)
*/ */
int fc_rport_init(struct fc_lport *lport) int fc_rport_init(struct fc_lport *lport)
{ {
if (!lport->tt.rport_flush_queue)
lport->tt.rport_flush_queue = fc_rport_flush_queue;
return 0; return 0;
} }
EXPORT_SYMBOL(fc_rport_init); EXPORT_SYMBOL(fc_rport_init);
......
...@@ -582,13 +582,6 @@ struct libfc_function_template { ...@@ -582,13 +582,6 @@ struct libfc_function_template {
*/ */
void (*exch_mgr_reset)(struct fc_lport *, u32 s_id, u32 d_id); void (*exch_mgr_reset)(struct fc_lport *, u32 s_id, u32 d_id);
/*
* Flush the rport work queue. Generally used before shutdown.
*
* STATUS: OPTIONAL
*/
void (*rport_flush_queue)(void);
/* /*
* Set the local port FC_ID. * Set the local port FC_ID.
* *
...@@ -994,6 +987,7 @@ void fc_rport_destroy(struct kref *kref); ...@@ -994,6 +987,7 @@ void fc_rport_destroy(struct kref *kref);
int fc_rport_login(struct fc_rport_priv *rdata); int fc_rport_login(struct fc_rport_priv *rdata);
int fc_rport_logoff(struct fc_rport_priv *rdata); int fc_rport_logoff(struct fc_rport_priv *rdata);
void fc_rport_recv_req(struct fc_lport *lport, struct fc_frame *fp); void fc_rport_recv_req(struct fc_lport *lport, struct fc_frame *fp);
void fc_rport_flush_queue(void);
/* /*
* DISCOVERY LAYER * DISCOVERY LAYER
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment