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

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

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



The previous patch moved all qla2x00_is_reserved_id() callers into
qla_init.c. Hence also move the qla2x00_is_reserved_id() definition into
qla_init.c.

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 ef1eb688

drivers/scsi/qla2xxx/qla_init.c

+11 −0
Original line number Diff line number Diff line
@@ -514,6 +514,17 @@ qla2x00_async_adisc(struct scsi_qla_host *vha, fc_port_t *fcport, 
	return rval;

}



static bool qla2x00_is_reserved_id(scsi_qla_host_t *vha, uint16_t loop_id)

{

	struct qla_hw_data *ha = vha->hw;



	if (IS_FWI2_CAPABLE(ha))

		return loop_id > NPH_LAST_HANDLE;



	return (loop_id > ha->max_loop_id && loop_id < SNS_FIRST_LOOP_ID) ||

		loop_id == MANAGEMENT_SERVER || loop_id == BROADCAST;

}



/**

 * qla2x00_find_new_loop_id - scan through our port list and find a new usable loop ID

 * @vha: adapter state pointer.

drivers/scsi/qla2xxx/qla_inline.h

+0 −11
Original line number Diff line number Diff line
@@ -90,17 +90,6 @@ host_to_adap(uint8_t *src, uint8_t *dst, uint32_t bsize) 
		*odest++ = cpu_to_le32(*isrc);

}



static inline int

qla2x00_is_reserved_id(scsi_qla_host_t *vha, uint16_t loop_id)

{

	struct qla_hw_data *ha = vha->hw;

	if (IS_FWI2_CAPABLE(ha))

		return (loop_id > NPH_LAST_HANDLE);



	return ((loop_id > ha->max_loop_id && loop_id < SNS_FIRST_LOOP_ID) ||

	    loop_id == MANAGEMENT_SERVER || loop_id == BROADCAST);

}



static inline void

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

{