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

Commit 074cec54 authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds
Browse files

[PATCH] alpha: switch to pci_get API 



Now that we have pci_get_bus_and_slot we can do the job correctly.  Note that
some of these calls intentionally leak a device - this is because the device
in question is always needed from boot to reboot.

Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 3869aa29

arch/alpha/kernel/pci.c

+2 −1
Original line number Diff line number Diff line
@@ -516,10 +516,11 @@ sys_pciconfig_iobase(long which, unsigned long bus, unsigned long dfn) 
		if (bus == 0 && dfn == 0) {

			hose = pci_isa_hose;

		} else {

			dev = pci_find_slot(bus, dfn);

			dev = pci_get_bus_and_slot(bus, dfn);

			if (!dev)

				return -ENODEV;

			hose = dev->sysdata;

			pci_dev_put(dev);

		}

	}

arch/alpha/kernel/sys_miata.c

+7 −3
Original line number Diff line number Diff line
@@ -183,12 +183,16 @@ miata_map_irq(struct pci_dev *dev, u8 slot, u8 pin) 


	if((slot == 7) && (PCI_FUNC(dev->devfn) == 3)) {

		u8 irq=0;



		if(pci_read_config_byte(pci_find_slot(dev->bus->number, dev->devfn & ~(7)), 0x40,&irq)!=PCIBIOS_SUCCESSFUL)

		struct pci_dev *pdev = pci_get_slot(dev->bus, dev->devfn & ~7);

		if(pdev == NULL || pci_read_config_byte(pdev, 0x40,&irq) != PCIBIOS_SUCCESSFUL) {

			pci_dev_put(pdev);

			return -1;

		else	

		}

		else	{

			pci_dev_put(pdev);

			return irq;

		}

	}



	return COMMON_TABLE_LOOKUP;

}

arch/alpha/kernel/sys_nautilus.c

+1 −1
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ nautilus_init_pci(void) 
	bus = pci_scan_bus(0, alpha_mv.pci_ops, hose);

	hose->bus = bus;



	irongate = pci_find_slot(0, 0);

	irongate = pci_get_bus_and_slot(0, 0);

	bus->self = irongate;

	bus->resource[1] = &irongate_mem;