diff options
Diffstat (limited to 'drivers/scsi/qla2xxx/qla_os.c')
-rw-r--r-- | drivers/scsi/qla2xxx/qla_os.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index 549122dc68e6..328cd26e33b9 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c | |||
@@ -1089,7 +1089,7 @@ static void | |||
1089 | qla2x00_enable_intrs(scsi_qla_host_t *ha) | 1089 | qla2x00_enable_intrs(scsi_qla_host_t *ha) |
1090 | { | 1090 | { |
1091 | unsigned long flags = 0; | 1091 | unsigned long flags = 0; |
1092 | device_reg_t __iomem *reg = ha->iobase; | 1092 | struct device_reg_2xxx __iomem *reg = &ha->iobase->isp; |
1093 | 1093 | ||
1094 | spin_lock_irqsave(&ha->hardware_lock, flags); | 1094 | spin_lock_irqsave(&ha->hardware_lock, flags); |
1095 | ha->interrupts_on = 1; | 1095 | ha->interrupts_on = 1; |
@@ -1104,7 +1104,7 @@ static void | |||
1104 | qla2x00_disable_intrs(scsi_qla_host_t *ha) | 1104 | qla2x00_disable_intrs(scsi_qla_host_t *ha) |
1105 | { | 1105 | { |
1106 | unsigned long flags = 0; | 1106 | unsigned long flags = 0; |
1107 | device_reg_t __iomem *reg = ha->iobase; | 1107 | struct device_reg_2xxx __iomem *reg = &ha->iobase->isp; |
1108 | 1108 | ||
1109 | spin_lock_irqsave(&ha->hardware_lock, flags); | 1109 | spin_lock_irqsave(&ha->hardware_lock, flags); |
1110 | ha->interrupts_on = 0; | 1110 | ha->interrupts_on = 0; |
@@ -1120,7 +1120,7 @@ qla2x00_disable_intrs(scsi_qla_host_t *ha) | |||
1120 | int qla2x00_probe_one(struct pci_dev *pdev, struct qla_board_info *brd_info) | 1120 | int qla2x00_probe_one(struct pci_dev *pdev, struct qla_board_info *brd_info) |
1121 | { | 1121 | { |
1122 | int ret = -ENODEV; | 1122 | int ret = -ENODEV; |
1123 | device_reg_t __iomem *reg; | 1123 | struct device_reg_2xxx __iomem *reg; |
1124 | struct Scsi_Host *host; | 1124 | struct Scsi_Host *host; |
1125 | scsi_qla_host_t *ha; | 1125 | scsi_qla_host_t *ha; |
1126 | unsigned long flags = 0; | 1126 | unsigned long flags = 0; |
@@ -1300,7 +1300,7 @@ int qla2x00_probe_one(struct pci_dev *pdev, struct qla_board_info *brd_info) | |||
1300 | DEBUG2(printk("DEBUG: detect hba %ld at address = %p\n", | 1300 | DEBUG2(printk("DEBUG: detect hba %ld at address = %p\n", |
1301 | ha->host_no, ha)); | 1301 | ha->host_no, ha)); |
1302 | 1302 | ||
1303 | reg = ha->iobase; | 1303 | reg = &ha->iobase->isp; |
1304 | 1304 | ||
1305 | ha->isp_ops.disable_intrs(ha); | 1305 | ha->isp_ops.disable_intrs(ha); |
1306 | 1306 | ||