Merge branch 'pci/yinghai-eisa' into for-linus (be7f088b) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/eisa/pci_eisa.c

+46 −21

Original line number	Diff line number	Diff line
		@@ -19,10 +19,10 @@
		/* There is only one pci_eisa device per machine, right ? */
		static struct eisa_root_device pci_eisa_root;

		static int __init pci_eisa_init(struct pci_dev *pdev,
		const struct pci_device_id *ent)
		static int __init pci_eisa_init(struct pci_dev *pdev)
		{
		int rc;
		int rc, i;
		struct resource res, bus_res = NULL;

		if ((rc = pci_enable_device (pdev))) {
		printk (KERN_ERR "pci_eisa : Could not enable device %s\n",
		@@ -30,9 +30,30 @@ static int __init pci_eisa_init(struct pci_dev *pdev,
		return rc;
		}

		/*
		* The Intel 82375 PCI-EISA bridge is a subtractive-decode PCI
		* device, so the resources available on EISA are the same as those
		* available on the 82375 bus. This works the same as a PCI-PCI
		* bridge in subtractive-decode mode (see pci_read_bridge_bases()).
		* We assume other PCI-EISA bridges are similar.
		*
		* eisa_root_register() can only deal with a single io port resource,
		* so we use the first valid io port resource.
		*/
		pci_bus_for_each_resource(pdev->bus, res, i)
		if (res && (res->flags & IORESOURCE_IO)) {
		bus_res = res;
		break;
		}

		if (!bus_res) {
		dev_err(&pdev->dev, "No resources available\n");
		return -1;
		}

		pci_eisa_root.dev = &pdev->dev;
		pci_eisa_root.res = pdev->bus->resource[0];
		pci_eisa_root.bus_base_addr = pdev->bus->resource[0]->start;
		pci_eisa_root.res = bus_res;
		pci_eisa_root.bus_base_addr = bus_res->start;
		pci_eisa_root.slots = EISA_MAX_SLOTS;
		pci_eisa_root.dma_mask = pdev->dma_mask;
		dev_set_drvdata(pci_eisa_root.dev, &pci_eisa_root);
		@@ -45,22 +66,26 @@ static int __init pci_eisa_init(struct pci_dev *pdev,
		return 0;
		}

		static struct pci_device_id pci_eisa_pci_tbl[] = {
		{ PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
		PCI_CLASS_BRIDGE_EISA << 8, 0xffff00, 0 },
		{ 0, }
		};

		static struct pci_driver __refdata pci_eisa_driver = {
		.name = "pci_eisa",
		.id_table = pci_eisa_pci_tbl,
		.probe = pci_eisa_init,
		};

		static int __init pci_eisa_init_module (void)
		/*
		* We have to call pci_eisa_init_early() before pnpacpi_init()/isapnp_init().
		* Otherwise pnp resource will get enabled early and could prevent eisa
		* to be initialized.
		* Also need to make sure pci_eisa_init_early() is called after
		* x86/pci_subsys_init().
		* So need to use subsys_initcall_sync with it.
		*/
		static int __init pci_eisa_init_early(void)
		{
		return pci_register_driver (&pci_eisa_driver);
		struct pci_dev *dev = NULL;
		int ret;

		for_each_pci_dev(dev)
		if ((dev->class >> 8) == PCI_CLASS_BRIDGE_EISA) {
		ret = pci_eisa_init(dev);
		if (ret)
		return ret;
		}

		device_initcall(pci_eisa_init_module);
		MODULE_DEVICE_TABLE(pci, pci_eisa_pci_tbl);
		return 0;
		}
		subsys_initcall_sync(pci_eisa_init_early);