openkylin
/
platform_kernel-5.15
mirror of https://gitee.com/openkylin/platform_kernel-5.15.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

The ->rport_recv_req callback only ever had one implementation,
so we can as well call it directly and drop the callback.

Signed-off-by: Hannes Reinecke <hare@suse.com>
Acked-by: Johannes Thumshirn <jth@kernel.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Hannes Reinecke 2016-10-18 10:01:45 +02:00 committed by Martin K. Petersen
parent c96c792aee
commit e76ee65fa6
3 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/scsi/libfc/fc_lport.c
View File

@ -902,7 +902,7 @@ static void fc_lport_recv_els_req(struct fc_lport *lport,
/* /*
* Check opcode. * Check opcode.
*/ */
recv = lport->tt.rport_recv_req; recv = fc_rport_recv_req;
switch (fc_frame_payload_op(fp)) { switch (fc_frame_payload_op(fp)) {
case ELS_FLOGI: case ELS_FLOGI:
if (!lport->point_to_multipoint) if (!lport->point_to_multipoint)

6
drivers/scsi/libfc/fc_rport.c
View File

@ -1786,7 +1786,7 @@ static void fc_rport_recv_els_req(struct fc_lport *lport, struct fc_frame *fp)
* *
* Reference counting: does not modify kref * Reference counting: does not modify kref
*/ */
static 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)
{ {
struct fc_seq_els_data els_data; struct fc_seq_els_data els_data;
@ -1823,6 +1823,7 @@ static void fc_rport_recv_req(struct fc_lport *lport, struct fc_frame *fp)
break; break;
} }
} }
EXPORT_SYMBOL(fc_rport_recv_req);
/** /**
* fc_rport_recv_plogi_req() - Handler for Port Login (PLOGI) requests * fc_rport_recv_plogi_req() - Handler for Port Login (PLOGI) requests
@ -2185,9 +2186,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_recv_req)
lport->tt.rport_recv_req = fc_rport_recv_req;
if (!lport->tt.rport_flush_queue) if (!lport->tt.rport_flush_queue)
lport->tt.rport_flush_queue = fc_rport_flush_queue; lport->tt.rport_flush_queue = fc_rport_flush_queue;

8
include/scsi/libfc.h
View File

@ -609,13 +609,6 @@ struct libfc_function_template {
void (*lport_set_port_id)(struct fc_lport *, u32 port_id, void (*lport_set_port_id)(struct fc_lport *, u32 port_id,
struct fc_frame *); struct fc_frame *);
/*
* Receive a request from a remote port.
*
* STATUS: OPTIONAL
*/
void (*rport_recv_req)(struct fc_lport *, struct fc_frame *);
/* /*
* Callback routine after the remote port is logged in * Callback routine after the remote port is logged in
* *
@ -1000,6 +993,7 @@ struct fc_rport_priv *fc_rport_create(struct fc_lport *, u32);
void fc_rport_destroy(struct kref *kref); 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);
/* /*
* DISCOVERY LAYER * DISCOVERY LAYER