diff options
author | James Smart <james.smart@emulex.com> | 2010-06-07 15:23:35 -0400 |
---|---|---|
committer | James Bottomley <James.Bottomley@suse.de> | 2010-07-27 13:01:32 -0400 |
commit | 6e7288d9a4b6691bf13fb07e3593d70d725d0737 (patch) | |
tree | 96541fadecb72ba942848da0c7ae71d772392849 /drivers/scsi/lpfc/lpfc.h | |
parent | ffc954936b134cc6d2eba1282cc71084929c3704 (diff) |
[SCSI] lpfc 8.3.13: Initialization code clean up and fixes.
- Add poll or wait flag parameter to hba_init_link and hba_down_link.
- (From Linux Community) Make return with ENXIO negative.
- Remove unused INB code from driver.
- Prevent block_magmt_io from returning until mailbox is inactive.
Signed-off-by: Alex Iannicelli <alex.iannicelli@emulex.com>
Signed-off-by: James Smart <james.smart@emulex.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi/lpfc/lpfc.h')
-rw-r--r-- | drivers/scsi/lpfc/lpfc.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h index e35a4c71eb9a..4cb78483bf79 100644 --- a/drivers/scsi/lpfc/lpfc.h +++ b/drivers/scsi/lpfc/lpfc.h | |||
@@ -510,9 +510,9 @@ struct lpfc_hba { | |||
510 | void (*lpfc_stop_port) | 510 | void (*lpfc_stop_port) |
511 | (struct lpfc_hba *); | 511 | (struct lpfc_hba *); |
512 | int (*lpfc_hba_init_link) | 512 | int (*lpfc_hba_init_link) |
513 | (struct lpfc_hba *); | 513 | (struct lpfc_hba *, uint32_t); |
514 | int (*lpfc_hba_down_link) | 514 | int (*lpfc_hba_down_link) |
515 | (struct lpfc_hba *); | 515 | (struct lpfc_hba *, uint32_t); |
516 | 516 | ||
517 | /* SLI4 specific HBA data structure */ | 517 | /* SLI4 specific HBA data structure */ |
518 | struct lpfc_sli4_hba sli4_hba; | 518 | struct lpfc_sli4_hba sli4_hba; |
@@ -525,7 +525,6 @@ struct lpfc_hba { | |||
525 | #define LPFC_SLI3_NPIV_ENABLED 0x02 | 525 | #define LPFC_SLI3_NPIV_ENABLED 0x02 |
526 | #define LPFC_SLI3_VPORT_TEARDOWN 0x04 | 526 | #define LPFC_SLI3_VPORT_TEARDOWN 0x04 |
527 | #define LPFC_SLI3_CRP_ENABLED 0x08 | 527 | #define LPFC_SLI3_CRP_ENABLED 0x08 |
528 | #define LPFC_SLI3_INB_ENABLED 0x10 | ||
529 | #define LPFC_SLI3_BG_ENABLED 0x20 | 528 | #define LPFC_SLI3_BG_ENABLED 0x20 |
530 | #define LPFC_SLI3_DSS_ENABLED 0x40 | 529 | #define LPFC_SLI3_DSS_ENABLED 0x40 |
531 | uint32_t iocb_cmd_size; | 530 | uint32_t iocb_cmd_size; |
@@ -557,9 +556,6 @@ struct lpfc_hba { | |||
557 | 556 | ||
558 | MAILBOX_t *mbox; | 557 | MAILBOX_t *mbox; |
559 | uint32_t *mbox_ext; | 558 | uint32_t *mbox_ext; |
560 | uint32_t *inb_ha_copy; | ||
561 | uint32_t *inb_counter; | ||
562 | uint32_t inb_last_counter; | ||
563 | uint32_t ha_copy; | 559 | uint32_t ha_copy; |
564 | struct _PCB *pcb; | 560 | struct _PCB *pcb; |
565 | struct _IOCB *IOCBs; | 561 | struct _IOCB *IOCBs; |