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

Commit ef1eb688 authored by Bart Van Assche's avatar Bart Van Assche Committed by Martin K. Petersen
Browse files

scsi: qla2xxx: Move qla2x00_clear_loop_id() from qla_inline.h into qla_init.c 



Since qla2x00_clear_loop_id() is not in the hot path, uninline it.

Cc: Himanshu Madhani <hmadhani@marvell.com>
Cc: Giridhar Malavali <gmalavali@marvell.com>
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Acked-by: default avatarHimanshu Madhani <hmadhani@marvell.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 6eaa5f94

drivers/scsi/qla2xxx/qla_gbl.h

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ extern int qla81xx_load_risc(scsi_qla_host_t *, uint32_t *); 


extern int qla2x00_perform_loop_resync(scsi_qla_host_t *);

extern int qla2x00_loop_resync(scsi_qla_host_t *);

extern void qla2x00_clear_loop_id(fc_port_t *fcport);



extern int qla2x00_fabric_login(scsi_qla_host_t *, fc_port_t *, uint16_t *);

extern int qla2x00_local_device_login(scsi_qla_host_t *, fc_port_t *);

drivers/scsi/qla2xxx/qla_init.c

+12 −0
Original line number Diff line number Diff line
@@ -557,6 +557,18 @@ static int qla2x00_find_new_loop_id(scsi_qla_host_t *vha, fc_port_t *dev) 
	return rval;

}



void qla2x00_clear_loop_id(fc_port_t *fcport)

{

	struct qla_hw_data *ha = fcport->vha->hw;



	if (fcport->loop_id == FC_NO_LOOP_ID ||

	    qla2x00_is_reserved_id(fcport->vha, fcport->loop_id))

		return;



	clear_bit(fcport->loop_id, ha->loop_id_map);

	fcport->loop_id = FC_NO_LOOP_ID;

}



static void qla24xx_handle_gnl_done_event(scsi_qla_host_t *vha,

	struct event_arg *ea)

{

drivers/scsi/qla2xxx/qla_inline.h

+0 −12
Original line number Diff line number Diff line
@@ -101,18 +101,6 @@ qla2x00_is_reserved_id(scsi_qla_host_t *vha, uint16_t loop_id) 
	    loop_id == MANAGEMENT_SERVER || loop_id == BROADCAST);

}



static inline void

qla2x00_clear_loop_id(fc_port_t *fcport) {

	struct qla_hw_data *ha = fcport->vha->hw;



	if (fcport->loop_id == FC_NO_LOOP_ID ||

	    qla2x00_is_reserved_id(fcport->vha, fcport->loop_id))

		return;



	clear_bit(fcport->loop_id, ha->loop_id_map);

	fcport->loop_id = FC_NO_LOOP_ID;

}



static inline void

qla2x00_clean_dsd_pool(struct qla_hw_data *ha, struct crc_context *ctx)

{