diff options
Diffstat (limited to 'drivers/pci/pci-efi.c')
| -rw-r--r-- | drivers/pci/pci-efi.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/pci/pci-efi.c b/drivers/pci/pci-efi.c index d107ff548d..b8cd663161 100644 --- a/drivers/pci/pci-efi.c +++ b/drivers/pci/pci-efi.c @@ -17,7 +17,7 @@ struct efi_pci_priv { struct efi_pci_root_bridge_io_protocol *protocol; - struct device_d *dev; + struct device *dev; struct pci_controller pci; struct resource mem; struct resource mem_pref; @@ -34,7 +34,7 @@ struct pci_child_id { struct pci_child { struct efi_pci_io_protocol *protocol; - struct device_d *dev; + struct device *dev; struct list_head list; struct pci_child_id id; }; @@ -268,7 +268,7 @@ DECLARE_PCI_FIXUP_EARLY(PCI_ANY_ID, PCI_ANY_ID, efi_pci_fixup_dev_parent); static int efi_pci_probe(struct efi_device *efidev) { - struct device_d *child; + struct device *child; struct efi_pci_priv *priv; efi_status_t efiret; void *resources; @@ -277,6 +277,9 @@ static int efi_pci_probe(struct efi_device *efidev) priv = xzalloc(sizeof(*priv)); + priv->pci.parent = &efidev->dev; + pci_controller_init(&priv->pci); + BS->handle_protocol(efidev->handle, &EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_GUID, (void **)&priv->protocol); if (!priv->protocol) @@ -310,7 +313,6 @@ static int efi_pci_probe(struct efi_device *efidev) } } - priv->pci.parent = &efidev->dev; priv->pci.pci_ops = &efi_pci_ops; INIT_LIST_HEAD(&priv->children); |