diff options
| author | Niklas Schnelle <schnelle@linux.ibm.com> | 2020-08-21 11:01:54 +0200 |
|---|---|---|
| committer | Vasily Gorbik <gor@linux.ibm.com> | 2020-09-14 11:38:34 +0200 |
| commit | 809fcfaf9238052f03e8002f6dad156a7fb6cd5e (patch) | |
| tree | 411dc902eb3986471bb9af7c2f450e738b1a5765 | |
| parent | s390/pci: remove unused function zpci_rescan() (diff) | |
| download | linux-809fcfaf9238052f03e8002f6dad156a7fb6cd5e.tar.xz linux-809fcfaf9238052f03e8002f6dad156a7fb6cd5e.zip | |
s390/pci: remove clp_rescan_pci_devices()
there is only one call site of clp_rescan_pci_devices() and
all the function does is call zpci_remove_reserved_devices()
followed by a duplicating clp_scan_pci_devices().
So inline the single call as a call to zpci_remove_reserved_devices()
and clp_scan_pci_devices() and remove the function.
Reviewed-by: Matthew Rosato <mjrosato@linux.ibm.com>
Signed-off-by: Niklas Schnelle <schnelle@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
| -rw-r--r-- | arch/s390/include/asm/pci.h | 1 | ||||
| -rw-r--r-- | arch/s390/pci/pci_clp.c | 17 | ||||
| -rw-r--r-- | arch/s390/pci/pci_event.c | 3 |
3 files changed, 2 insertions, 19 deletions
diff --git a/arch/s390/include/asm/pci.h b/arch/s390/include/asm/pci.h index 140cb6bc8e1c..430f694163c1 100644 --- a/arch/s390/include/asm/pci.h +++ b/arch/s390/include/asm/pci.h @@ -210,7 +210,6 @@ void zpci_remove_reserved_devices(void); /* CLP */ int clp_setup_writeback_mio(void); int clp_scan_pci_devices(void); -int clp_rescan_pci_devices(void); int clp_rescan_pci_devices_simple(u32 *fid); int clp_add_pci_device(u32, u32, int); int clp_enable_fh(struct zpci_dev *, u8); diff --git a/arch/s390/pci/pci_clp.c b/arch/s390/pci/pci_clp.c index 51807945ca00..6aabfb131c1e 100644 --- a/arch/s390/pci/pci_clp.c +++ b/arch/s390/pci/pci_clp.c @@ -441,23 +441,6 @@ int clp_scan_pci_devices(void) return rc; } -int clp_rescan_pci_devices(void) -{ - struct clp_req_rsp_list_pci *rrb; - int rc; - - zpci_remove_reserved_devices(); - - rrb = clp_alloc_block(GFP_KERNEL); - if (!rrb) - return -ENOMEM; - - rc = clp_list_pci(rrb, NULL, __clp_add); - - clp_free_block(rrb); - return rc; -} - /* Rescan PCI functions and refresh function handles. If fid is non-NULL only * refresh the handle of the function matching @fid */ diff --git a/arch/s390/pci/pci_event.c b/arch/s390/pci/pci_event.c index 9a3a291cad43..e67cc2f6e169 100644 --- a/arch/s390/pci/pci_event.c +++ b/arch/s390/pci/pci_event.c @@ -150,7 +150,8 @@ static void __zpci_event_availability(struct zpci_ccdf_avail *ccdf) } break; case 0x0306: /* 0x308 or 0x302 for multiple devices */ - clp_rescan_pci_devices(); + zpci_remove_reserved_devices(); + clp_scan_pci_devices(); break; case 0x0308: /* Standby -> Reserved */ if (!zdev) |