From 99d7ee1787e5783337918290958ee6fca8ecdc9e Mon Sep 17 00:00:00 2001 From: Sebastian Ott Date: Tue, 16 Apr 2013 14:13:21 +0200 Subject: [PATCH] --- yaml --- r: 362798 b: refs/heads/master c: af0a8a8453f7c7b3497c9fecc053897690e00695 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/s390/pci/pci.c | 14 +++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 53d7be74fde5..195489a69eef 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cb65a669f62ecca123cf4f6998903ee628c59caf +refs/heads/master: af0a8a8453f7c7b3497c9fecc053897690e00695 diff --git a/trunk/arch/s390/pci/pci.c b/trunk/arch/s390/pci/pci.c index 24dcf059f061..01478f63c8a8 100644 --- a/trunk/arch/s390/pci/pci.c +++ b/trunk/arch/s390/pci/pci.c @@ -868,6 +868,17 @@ static void zpci_free_iomap(struct zpci_dev *zdev, int entry) spin_unlock(&zpci_iomap_lock); } +int pcibios_add_device(struct pci_dev *pdev) +{ + struct zpci_dev *zdev = get_zdev(pdev); + + zpci_debug_init_device(zdev); + zpci_fmb_enable_device(zdev); + zpci_map_resources(zdev); + + return 0; +} + static int zpci_create_device_bus(struct zpci_dev *zdev) { struct resource *res; @@ -1019,9 +1030,6 @@ int zpci_scan_device(struct zpci_dev *zdev) goto out; } - zpci_debug_init_device(zdev); - zpci_fmb_enable_device(zdev); - zpci_map_resources(zdev); pci_bus_add_devices(zdev->bus); /* now that pdev was added to the bus mark it as used */