diff options
Diffstat (limited to 'drivers/scsi/qla4xxx/ql4_os.c')
-rw-r--r-- | drivers/scsi/qla4xxx/ql4_os.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c index 3d9419460e0c..ee47820c30a6 100644 --- a/drivers/scsi/qla4xxx/ql4_os.c +++ b/drivers/scsi/qla4xxx/ql4_os.c | |||
@@ -834,7 +834,7 @@ static enum blk_eh_timer_return qla4xxx_eh_cmd_timed_out(struct scsi_cmnd *sc) | |||
834 | static void qla4xxx_set_port_speed(struct Scsi_Host *shost) | 834 | static void qla4xxx_set_port_speed(struct Scsi_Host *shost) |
835 | { | 835 | { |
836 | struct scsi_qla_host *ha = to_qla_host(shost); | 836 | struct scsi_qla_host *ha = to_qla_host(shost); |
837 | struct iscsi_cls_host *ihost = shost_priv(shost); | 837 | struct iscsi_cls_host *ihost = shost->shost_data; |
838 | uint32_t speed = ISCSI_PORT_SPEED_UNKNOWN; | 838 | uint32_t speed = ISCSI_PORT_SPEED_UNKNOWN; |
839 | 839 | ||
840 | qla4xxx_get_firmware_state(ha); | 840 | qla4xxx_get_firmware_state(ha); |
@@ -859,7 +859,7 @@ static void qla4xxx_set_port_speed(struct Scsi_Host *shost) | |||
859 | static void qla4xxx_set_port_state(struct Scsi_Host *shost) | 859 | static void qla4xxx_set_port_state(struct Scsi_Host *shost) |
860 | { | 860 | { |
861 | struct scsi_qla_host *ha = to_qla_host(shost); | 861 | struct scsi_qla_host *ha = to_qla_host(shost); |
862 | struct iscsi_cls_host *ihost = shost_priv(shost); | 862 | struct iscsi_cls_host *ihost = shost->shost_data; |
863 | uint32_t state = ISCSI_PORT_STATE_DOWN; | 863 | uint32_t state = ISCSI_PORT_STATE_DOWN; |
864 | 864 | ||
865 | if (test_bit(AF_LINK_UP, &ha->flags)) | 865 | if (test_bit(AF_LINK_UP, &ha->flags)) |
@@ -3445,7 +3445,6 @@ static void qla4xxx_free_adapter(struct scsi_qla_host *ha) | |||
3445 | int qla4_8xxx_iospace_config(struct scsi_qla_host *ha) | 3445 | int qla4_8xxx_iospace_config(struct scsi_qla_host *ha) |
3446 | { | 3446 | { |
3447 | int status = 0; | 3447 | int status = 0; |
3448 | uint8_t revision_id; | ||
3449 | unsigned long mem_base, mem_len, db_base, db_len; | 3448 | unsigned long mem_base, mem_len, db_base, db_len; |
3450 | struct pci_dev *pdev = ha->pdev; | 3449 | struct pci_dev *pdev = ha->pdev; |
3451 | 3450 | ||
@@ -3457,10 +3456,9 @@ int qla4_8xxx_iospace_config(struct scsi_qla_host *ha) | |||
3457 | goto iospace_error_exit; | 3456 | goto iospace_error_exit; |
3458 | } | 3457 | } |
3459 | 3458 | ||
3460 | pci_read_config_byte(pdev, PCI_REVISION_ID, &revision_id); | ||
3461 | DEBUG2(printk(KERN_INFO "%s: revision-id=%d\n", | 3459 | DEBUG2(printk(KERN_INFO "%s: revision-id=%d\n", |
3462 | __func__, revision_id)); | 3460 | __func__, pdev->revision)); |
3463 | ha->revision_id = revision_id; | 3461 | ha->revision_id = pdev->revision; |
3464 | 3462 | ||
3465 | /* remap phys address */ | 3463 | /* remap phys address */ |
3466 | mem_base = pci_resource_start(pdev, 0); /* 0 is for BAR 0 */ | 3464 | mem_base = pci_resource_start(pdev, 0); /* 0 is for BAR 0 */ |