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

Commit 23be331d authored by Adrian Bunk's avatar Adrian Bunk Committed by James Bottomley
Browse files

[SCSI] qla2xxx: make qla2x00_reg_remote_port() static 



Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Acked-by: default avatarAndrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent d8dafd8c

drivers/scsi/qla2xxx/qla_gbl.h

+0 −1
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ extern void qla2x00_update_fcports(scsi_qla_host_t *); 
extern int qla2x00_abort_isp(scsi_qla_host_t *);



extern void qla2x00_update_fcport(scsi_qla_host_t *, fc_port_t *);

extern void qla2x00_reg_remote_port(scsi_qla_host_t *, fc_port_t *);



extern void qla2x00_alloc_fw_dump(scsi_qla_host_t *);

extern void qla2x00_try_to_stop_firmware(scsi_qla_host_t *);

drivers/scsi/qla2xxx/qla_init.c

+34 −34
Original line number Diff line number Diff line
@@ -2103,40 +2103,7 @@ qla2x00_iidma_fcport(scsi_qla_host_t *ha, fc_port_t *fcport) 
	}

}



/*

 * qla2x00_update_fcport

 *	Updates device on list.

 *

 * Input:

 *	ha = adapter block pointer.

 *	fcport = port structure pointer.

 *

 * Return:

 *	0  - Success

 *  BIT_0 - error

 *

 * Context:

 *	Kernel context.

 */

void

qla2x00_update_fcport(scsi_qla_host_t *ha, fc_port_t *fcport)

{

	fcport->ha = ha;

	fcport->login_retry = 0;

	fcport->port_login_retry_count = ha->port_down_retry_count *

	    PORT_RETRY_TIME;

	atomic_set(&fcport->port_down_timer, ha->port_down_retry_count *

	    PORT_RETRY_TIME);

	fcport->flags &= ~FCF_LOGIN_NEEDED;



	qla2x00_iidma_fcport(ha, fcport);



	atomic_set(&fcport->state, FCS_ONLINE);



	qla2x00_reg_remote_port(ha, fcport);

}



void

static void

qla2x00_reg_remote_port(scsi_qla_host_t *ha, fc_port_t *fcport)

{

	struct fc_rport_identifiers rport_ids;
@@ -2178,6 +2145,39 @@ qla2x00_reg_remote_port(scsi_qla_host_t *ha, fc_port_t *fcport) 
		fcport->os_target_id = rport->scsi_target_id;

}



/*

 * qla2x00_update_fcport

 *	Updates device on list.

 *

 * Input:

 *	ha = adapter block pointer.

 *	fcport = port structure pointer.

 *

 * Return:

 *	0  - Success

 *  BIT_0 - error

 *

 * Context:

 *	Kernel context.

 */

void

qla2x00_update_fcport(scsi_qla_host_t *ha, fc_port_t *fcport)

{

	fcport->ha = ha;

	fcport->login_retry = 0;

	fcport->port_login_retry_count = ha->port_down_retry_count *

	    PORT_RETRY_TIME;

	atomic_set(&fcport->port_down_timer, ha->port_down_retry_count *

	    PORT_RETRY_TIME);

	fcport->flags &= ~FCF_LOGIN_NEEDED;



	qla2x00_iidma_fcport(ha, fcport);



	atomic_set(&fcport->state, FCS_ONLINE);



	qla2x00_reg_remote_port(ha, fcport);

}



/*

 * qla2x00_configure_fabric

 *      Setup SNS devices with loop ID's.