mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 05:48:40 +00:00
[SCSI] qla4xxx: Replace all !is_qla8022() with is_qla40XX()
Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com> Reviewed-by: Mike Christie <michaelc@cs.wisc.edu> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
This commit is contained in:
parent
33693c7aab
commit
ee996a6917
3 changed files with 12 additions and 12 deletions
|
@ -17,7 +17,7 @@ qla4_8xxx_sysfs_read_fw_dump(struct file *filep, struct kobject *kobj,
|
|||
struct scsi_qla_host *ha = to_qla_host(dev_to_shost(container_of(kobj,
|
||||
struct device, kobj)));
|
||||
|
||||
if (!is_qla8022(ha))
|
||||
if (is_qla40XX(ha))
|
||||
return -EINVAL;
|
||||
|
||||
if (!test_bit(AF_82XX_DUMP_READING, &ha->flags))
|
||||
|
@ -38,7 +38,7 @@ qla4_8xxx_sysfs_write_fw_dump(struct file *filep, struct kobject *kobj,
|
|||
long reading;
|
||||
int ret = 0;
|
||||
|
||||
if (!is_qla8022(ha))
|
||||
if (is_qla40XX(ha))
|
||||
return -EINVAL;
|
||||
|
||||
if (off != 0)
|
||||
|
@ -214,7 +214,7 @@ qla4xxx_phy_port_cnt_show(struct device *dev, struct device_attribute *attr,
|
|||
{
|
||||
struct scsi_qla_host *ha = to_qla_host(class_to_shost(dev));
|
||||
|
||||
if (!is_qla8022(ha))
|
||||
if (is_qla40XX(ha))
|
||||
return -ENOSYS;
|
||||
|
||||
return snprintf(buf, PAGE_SIZE, "0x%04X\n", ha->phy_port_cnt);
|
||||
|
@ -226,7 +226,7 @@ qla4xxx_phy_port_num_show(struct device *dev, struct device_attribute *attr,
|
|||
{
|
||||
struct scsi_qla_host *ha = to_qla_host(class_to_shost(dev));
|
||||
|
||||
if (!is_qla8022(ha))
|
||||
if (is_qla40XX(ha))
|
||||
return -ENOSYS;
|
||||
|
||||
return snprintf(buf, PAGE_SIZE, "0x%04X\n", ha->phy_port_num);
|
||||
|
@ -238,7 +238,7 @@ qla4xxx_iscsi_func_cnt_show(struct device *dev, struct device_attribute *attr,
|
|||
{
|
||||
struct scsi_qla_host *ha = to_qla_host(class_to_shost(dev));
|
||||
|
||||
if (!is_qla8022(ha))
|
||||
if (is_qla40XX(ha))
|
||||
return -ENOSYS;
|
||||
|
||||
return snprintf(buf, PAGE_SIZE, "0x%04X\n", ha->iscsi_pci_func_cnt);
|
||||
|
|
|
@ -1193,7 +1193,7 @@ int qla4xxx_request_irqs(struct scsi_qla_host *ha)
|
|||
{
|
||||
int ret;
|
||||
|
||||
if (!is_qla8022(ha))
|
||||
if (is_qla40XX(ha))
|
||||
goto try_intx;
|
||||
|
||||
if (ql4xenablemsix == 2)
|
||||
|
|
|
@ -2658,7 +2658,7 @@ static void qla4xxx_timer(struct scsi_qla_host *ha)
|
|||
qla4_8xxx_watchdog(ha);
|
||||
}
|
||||
|
||||
if (!is_qla8022(ha)) {
|
||||
if (is_qla40XX(ha)) {
|
||||
/* Check for heartbeat interval. */
|
||||
if (ha->firmware_options & FWOPT_HEARTBEAT_ENABLE &&
|
||||
ha->heartbeat_interval != 0) {
|
||||
|
@ -2982,8 +2982,8 @@ static int qla4xxx_recover_adapter(struct scsi_qla_host *ha)
|
|||
/* Issue full chip reset if recovering from a catastrophic error,
|
||||
* or if stop_firmware fails for ISP-82xx.
|
||||
* This is the default case for ISP-4xxx */
|
||||
if (!is_qla8022(ha) || reset_chip) {
|
||||
if (!is_qla8022(ha))
|
||||
if (is_qla40XX(ha) || reset_chip) {
|
||||
if (is_qla40XX(ha))
|
||||
goto chip_reset;
|
||||
|
||||
/* Check if 82XX firmware is alive or not
|
||||
|
@ -3023,7 +3023,7 @@ static int qla4xxx_recover_adapter(struct scsi_qla_host *ha)
|
|||
/* For ISP-4xxx, force function 1 to always initialize
|
||||
* before function 3 to prevent both funcions from
|
||||
* stepping on top of the other */
|
||||
if (!is_qla8022(ha) && (ha->mac_index == 3))
|
||||
if (is_qla40XX(ha) && (ha->mac_index == 3))
|
||||
ssleep(6);
|
||||
|
||||
/* NOTE: AF_ONLINE flag set upon successful completion of
|
||||
|
@ -5238,7 +5238,7 @@ static int __devinit qla4xxx_probe_adapter(struct pci_dev *pdev,
|
|||
* so that irqs will be registered after crbinit but before
|
||||
* mbx_intr_enable.
|
||||
*/
|
||||
if (!is_qla8022(ha)) {
|
||||
if (is_qla40XX(ha)) {
|
||||
ret = qla4xxx_request_irqs(ha);
|
||||
if (ret) {
|
||||
ql4_printk(KERN_WARNING, ha, "Failed to reserve "
|
||||
|
@ -5373,7 +5373,7 @@ static void __devexit qla4xxx_remove_adapter(struct pci_dev *pdev)
|
|||
|
||||
ha = pci_get_drvdata(pdev);
|
||||
|
||||
if (!is_qla8022(ha))
|
||||
if (is_qla40XX(ha))
|
||||
qla4xxx_prevent_other_port_reinit(ha);
|
||||
|
||||
/* destroy iface from sysfs */
|
||||
|
|
Loading…
Reference in a new issue