From caf6c4820355cec90853afd3c81548a9acbd54d4 Mon Sep 17 00:00:00 2001 From: Andrew Vasquez Date: Thu, 20 Sep 2007 14:07:47 -0700 Subject: [PATCH] --- yaml --- r: 68919 b: refs/heads/master c: 26ff776d1dd9147eb658c55f1df42c2c232036b5 h: refs/heads/master i: 68917: 65f5ddee9e05966be212fbe650ec93850fb46876 68915: b2b3d235c719d5375d9a69aabb9aa71a90aa2ef3 68911: dc9b71d563fd28b8b252dd04056a48413aba3f7f v: v3 --- [refs] | 2 +- trunk/drivers/scsi/qla2xxx/qla_mid.c | 34 ++-------------------------- 2 files changed, 3 insertions(+), 33 deletions(-) diff --git a/[refs] b/[refs] index d0da9fb2d041..b39d415791e1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 700ca0e7016008f65f75c2629e309fc03347c856 +refs/heads/master: 26ff776d1dd9147eb658c55f1df42c2c232036b5 diff --git a/trunk/drivers/scsi/qla2xxx/qla_mid.c b/trunk/drivers/scsi/qla2xxx/qla_mid.c index 1a2cdcd915c0..821ee74aadc6 100644 --- a/trunk/drivers/scsi/qla2xxx/qla_mid.c +++ b/trunk/drivers/scsi/qla2xxx/qla_mid.c @@ -104,7 +104,7 @@ qla24xx_find_vhost_by_name(scsi_qla_host_t *ha, uint8_t *port_name) * * Context: */ -void +static void qla2x00_mark_vp_devices_dead(scsi_qla_host_t *vha) { fc_port_t *fcport; @@ -179,37 +179,7 @@ qla24xx_enable_vp(scsi_qla_host_t *vha) return 1; } -/** - * qla24xx_modify_vport() - Modifies the virtual fabric port's configuration - * @ha: HA context - * @vp: pointer to buffer of virtual port parameters. - * @ret_code: return error code: - * - * Returns the virtual port id, or MAX_VSAN_ID, if couldn't create. - */ -uint32_t -qla24xx_modify_vhba(scsi_qla_host_t *ha, vport_params_t *vp, uint32_t *vp_id) -{ - scsi_qla_host_t *vha; - - vha = qla24xx_find_vhost_by_name(ha, vp->port_name); - if (!vha) { - *vp_id = MAX_NUM_VPORT_LOOP; - return VP_RET_CODE_WWPN; - } - - if (qla24xx_enable_vp(vha)) { - scsi_host_put(vha->host); - qla2x00_mem_free(vha); - *vp_id = MAX_NUM_VPORT_LOOP; - return VP_RET_CODE_RESOURCES; - } - - *vp_id = vha->vp_idx; - return VP_RET_CODE_OK; -} - -void +static void qla24xx_configure_vp(scsi_qla_host_t *vha) { struct fc_vport *fc_vport;