diff options
author | Andrew Vasquez <andrew.vasquez@qlogic.com> | 2008-01-31 15:33:49 -0500 |
---|---|---|
committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2008-02-07 19:02:39 -0500 |
commit | 3db0652ef986f3bc3d779c4f986330ee3fdd50cc (patch) | |
tree | 3354de3b9404a4ca5b1bef6045fcf8338d61c0c6 /drivers/scsi/qla2xxx/qla_os.c | |
parent | e87110852d0bd331d50c3de686a7fc9626579d60 (diff) |
[SCSI] qla2xxx: Consolidate RISC-parity enablement codes.
Collapse duplicate codes called during probe() and RISC-reset
into qla2x00_setup_chip().
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'drivers/scsi/qla2xxx/qla_os.c')
-rw-r--r-- | drivers/scsi/qla2xxx/qla_os.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index 7f78e9400523..5270e2d0d114 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c | |||
@@ -1780,18 +1780,6 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
1780 | WRT_REG_WORD(®->isp.semaphore, 0); | 1780 | WRT_REG_WORD(®->isp.semaphore, 0); |
1781 | WRT_REG_WORD(®->isp.hccr, HCCR_CLR_RISC_INT); | 1781 | WRT_REG_WORD(®->isp.hccr, HCCR_CLR_RISC_INT); |
1782 | WRT_REG_WORD(®->isp.hccr, HCCR_CLR_HOST_INT); | 1782 | WRT_REG_WORD(®->isp.hccr, HCCR_CLR_HOST_INT); |
1783 | |||
1784 | /* Enable proper parity */ | ||
1785 | if (!IS_QLA2100(ha) && !IS_QLA2200(ha)) { | ||
1786 | if (IS_QLA2300(ha)) | ||
1787 | /* SRAM parity */ | ||
1788 | WRT_REG_WORD(®->isp.hccr, | ||
1789 | (HCCR_ENABLE_PARITY + 0x1)); | ||
1790 | else | ||
1791 | /* SRAM, Instruction RAM and GP RAM parity */ | ||
1792 | WRT_REG_WORD(®->isp.hccr, | ||
1793 | (HCCR_ENABLE_PARITY + 0x7)); | ||
1794 | } | ||
1795 | } | 1783 | } |
1796 | spin_unlock_irqrestore(&ha->hardware_lock, flags); | 1784 | spin_unlock_irqrestore(&ha->hardware_lock, flags); |
1797 | 1785 | ||