aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390/pci/pci.c
diff options
context:
space:
mode:
authorSebastian Ott <sebott@linux.vnet.ibm.com>2013-08-29 13:37:28 -0400
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2013-08-30 02:57:17 -0400
commit1d57896638f080165165dd9fb4cf848220dfd853 (patch)
tree679a611e0a39e865855a611f5c8d5d90c0122470 /arch/s390/pci/pci.c
parent77e844b9644026c11c5883144540155de39af767 (diff)
s390/pci: split lpf
List pci functions is used to query and iterate over pci functions. This function currently has 2 users - initial device discovery and rescan after a machine check. Instead of having a multipurpose function pass a callback which gets called for each pci function. Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/pci/pci.c')
-rw-r--r--arch/s390/pci/pci.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/s390/pci/pci.c b/arch/s390/pci/pci.c
index b0ccd424308a..a7ed6685e7fb 100644
--- a/arch/s390/pci/pci.c
+++ b/arch/s390/pci/pci.c
@@ -99,11 +99,6 @@ struct zpci_dev *get_zdev_by_fid(u32 fid)
99 return zdev; 99 return zdev;
100} 100}
101 101
102bool zpci_fid_present(u32 fid)
103{
104 return (get_zdev_by_fid(fid) != NULL) ? true : false;
105}
106
107static struct zpci_dev *get_zdev_by_bus(struct pci_bus *bus) 102static struct zpci_dev *get_zdev_by_bus(struct pci_bus *bus)
108{ 103{
109 return (bus && bus->sysdata) ? (struct zpci_dev *) bus->sysdata : NULL; 104 return (bus && bus->sysdata) ? (struct zpci_dev *) bus->sysdata : NULL;
@@ -926,7 +921,7 @@ static int __init pci_base_init(void)
926 if (rc) 921 if (rc)
927 goto out_dma; 922 goto out_dma;
928 923
929 rc = clp_find_pci_devices(); 924 rc = clp_scan_pci_devices();
930 if (rc) 925 if (rc)
931 goto out_find; 926 goto out_find;
932 927