Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f65dedfd authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: use ide_pci_is_in_compatibility_mode() in ide_pci_init_{one,two}() 



Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 5bae8bf4

drivers/ide/setup-pci.c

+6 −10
Original line number Diff line number Diff line
@@ -568,13 +568,11 @@ int ide_pci_init_one(struct pci_dev *dev, const struct ide_port_info *d, 
		goto out;



	/* fixup IRQ */

	hw[1].irq = hw[0].irq = ret;



	if ((ret == 0 && (d->host_flags & IDE_HFLAG_LEGACY_IRQS)) ||

	    (d->host_flags & IDE_HFLAG_FORCE_LEGACY_IRQS)) {

	if (ide_pci_is_in_compatibility_mode(dev)) {

		hw[0].irq = pci_get_legacy_ide_irq(dev, 0);

		hw[1].irq = pci_get_legacy_ide_irq(dev, 1);

	}

	} else

		hw[1].irq = hw[0].irq = ret;



	ret = ide_host_register(host, d, hws);

	if (ret)
@@ -625,13 +623,11 @@ int ide_pci_init_two(struct pci_dev *dev1, struct pci_dev *dev2, 
			goto out;



		/* fixup IRQ */

		hw[i*2 + 1].irq = hw[i*2].irq = ret;



		if ((ret == 0 && (d->host_flags & IDE_HFLAG_LEGACY_IRQS)) ||

		    (d->host_flags & IDE_HFLAG_FORCE_LEGACY_IRQS)) {

		if (ide_pci_is_in_compatibility_mode(pdev[i])) {

			hw[i*2].irq = pci_get_legacy_ide_irq(pdev[i], 0);

			hw[i*2 + 1].irq = pci_get_legacy_ide_irq(pdev[i], 1);

		}

		} else

			hw[i*2 + 1].irq = hw[i*2].irq = ret;

	}



	ret = ide_host_register(host, d, hws);