Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e76ee65f authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Martin K. Petersen
Browse files

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: 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 c96c792a

drivers/scsi/libfc/fc_lport.c

+1 −1
Original line number Diff line number Diff line
@@ -902,7 +902,7 @@ static void fc_lport_recv_els_req(struct fc_lport *lport, 
		/*

		 * Check opcode.

		 */

		recv = lport->tt.rport_recv_req;

		recv = fc_rport_recv_req;

		switch (fc_frame_payload_op(fp)) {

		case ELS_FLOGI:

			if (!lport->point_to_multipoint)

drivers/scsi/libfc/fc_rport.c

+2 −4
Original line number Diff line number Diff line
@@ -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

 */

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;
@@ -1823,6 +1823,7 @@ static void fc_rport_recv_req(struct fc_lport *lport, struct fc_frame *fp) 
		break;

	}

}

EXPORT_SYMBOL(fc_rport_recv_req);



/**

 * 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)

{

	if (!lport->tt.rport_recv_req)

		lport->tt.rport_recv_req = fc_rport_recv_req;



	if (!lport->tt.rport_flush_queue)

		lport->tt.rport_flush_queue = fc_rport_flush_queue;

include/scsi/libfc.h

+1 −7
Original line number Diff line number Diff line
@@ -609,13 +609,6 @@ struct libfc_function_template { 
	void (*lport_set_port_id)(struct fc_lport *, u32 port_id,

				  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

	 *
@@ -1000,6 +993,7 @@ struct fc_rport_priv *fc_rport_create(struct fc_lport *, u32); 
void fc_rport_destroy(struct kref *kref);

int fc_rport_login(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