diff options
author | Brian King <brking@linux.vnet.ibm.com> | 2009-10-19 16:07:49 -0400 |
---|---|---|
committer | James Bottomley <James.Bottomley@suse.de> | 2009-12-04 13:00:19 -0500 |
commit | 861890c62d46bd29c73d75fc907aeffd1c4eee06 (patch) | |
tree | 984a92317f5c8811fb20637acf5a47edad6a92d0 /drivers/scsi | |
parent | 7043110550f19c1556ad18dc4d63b1c9eaf9e4fd (diff) |
[SCSI] ibmvfc: Remove unnecessary parameter to ibmvfc_init_host
Remove a parameter to ibmvfc_init_host which is always set to
zero by all callers.
Signed-off-by: Brian King <brking@linux.vnet.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi')
-rw-r--r-- | drivers/scsi/ibmvscsi/ibmvfc.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/drivers/scsi/ibmvscsi/ibmvfc.c b/drivers/scsi/ibmvscsi/ibmvfc.c index d37230faf086..696328699ec3 100644 --- a/drivers/scsi/ibmvscsi/ibmvfc.c +++ b/drivers/scsi/ibmvscsi/ibmvfc.c | |||
@@ -558,12 +558,11 @@ static void ibmvfc_link_down(struct ibmvfc_host *vhost, | |||
558 | /** | 558 | /** |
559 | * ibmvfc_init_host - Start host initialization | 559 | * ibmvfc_init_host - Start host initialization |
560 | * @vhost: ibmvfc host struct | 560 | * @vhost: ibmvfc host struct |
561 | * @relogin: is this a re-login? | ||
562 | * | 561 | * |
563 | * Return value: | 562 | * Return value: |
564 | * nothing | 563 | * nothing |
565 | **/ | 564 | **/ |
566 | static void ibmvfc_init_host(struct ibmvfc_host *vhost, int relogin) | 565 | static void ibmvfc_init_host(struct ibmvfc_host *vhost) |
567 | { | 566 | { |
568 | struct ibmvfc_target *tgt; | 567 | struct ibmvfc_target *tgt; |
569 | 568 | ||
@@ -577,10 +576,8 @@ static void ibmvfc_init_host(struct ibmvfc_host *vhost, int relogin) | |||
577 | } | 576 | } |
578 | 577 | ||
579 | if (!ibmvfc_set_host_state(vhost, IBMVFC_INITIALIZING)) { | 578 | if (!ibmvfc_set_host_state(vhost, IBMVFC_INITIALIZING)) { |
580 | if (!relogin) { | 579 | memset(vhost->async_crq.msgs, 0, PAGE_SIZE); |
581 | memset(vhost->async_crq.msgs, 0, PAGE_SIZE); | 580 | vhost->async_crq.cur = 0; |
582 | vhost->async_crq.cur = 0; | ||
583 | } | ||
584 | 581 | ||
585 | list_for_each_entry(tgt, &vhost->targets, queue) | 582 | list_for_each_entry(tgt, &vhost->targets, queue) |
586 | ibmvfc_set_tgt_action(tgt, IBMVFC_TGT_ACTION_DEL_RPORT); | 583 | ibmvfc_set_tgt_action(tgt, IBMVFC_TGT_ACTION_DEL_RPORT); |
@@ -2303,13 +2300,13 @@ static void ibmvfc_handle_crq(struct ibmvfc_crq *crq, struct ibmvfc_host *vhost) | |||
2303 | /* Send back a response */ | 2300 | /* Send back a response */ |
2304 | rc = ibmvfc_send_crq_init_complete(vhost); | 2301 | rc = ibmvfc_send_crq_init_complete(vhost); |
2305 | if (rc == 0) | 2302 | if (rc == 0) |
2306 | ibmvfc_init_host(vhost, 0); | 2303 | ibmvfc_init_host(vhost); |
2307 | else | 2304 | else |
2308 | dev_err(vhost->dev, "Unable to send init rsp. rc=%ld\n", rc); | 2305 | dev_err(vhost->dev, "Unable to send init rsp. rc=%ld\n", rc); |
2309 | break; | 2306 | break; |
2310 | case IBMVFC_CRQ_INIT_COMPLETE: | 2307 | case IBMVFC_CRQ_INIT_COMPLETE: |
2311 | dev_info(vhost->dev, "Partner initialization complete\n"); | 2308 | dev_info(vhost->dev, "Partner initialization complete\n"); |
2312 | ibmvfc_init_host(vhost, 0); | 2309 | ibmvfc_init_host(vhost); |
2313 | break; | 2310 | break; |
2314 | default: | 2311 | default: |
2315 | dev_err(vhost->dev, "Unknown crq message type: %d\n", crq->format); | 2312 | dev_err(vhost->dev, "Unknown crq message type: %d\n", crq->format); |
@@ -3731,7 +3728,7 @@ static void ibmvfc_npiv_logout_done(struct ibmvfc_event *evt) | |||
3731 | case IBMVFC_MAD_SUCCESS: | 3728 | case IBMVFC_MAD_SUCCESS: |
3732 | if (list_empty(&vhost->sent) && | 3729 | if (list_empty(&vhost->sent) && |
3733 | vhost->action == IBMVFC_HOST_ACTION_LOGO_WAIT) { | 3730 | vhost->action == IBMVFC_HOST_ACTION_LOGO_WAIT) { |
3734 | ibmvfc_init_host(vhost, 0); | 3731 | ibmvfc_init_host(vhost); |
3735 | return; | 3732 | return; |
3736 | } | 3733 | } |
3737 | break; | 3734 | break; |