iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

s390/pci: remove clp_rescan_pci_devices()

Browse Source 
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>
This commit is contained in:
Niklas Schnelle 2020-08-21 11:01:54 +02:00 committed by Vasily Gorbik
parent 2bce60b503
commit 809fcfaf92
3 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/s390/include/asm/pci.h
View File

@ -210,7 +210,6 @@ void zpci_remove_reserved_devices(void);
/* CLP */ /* CLP */
int clp_setup_writeback_mio(void); int clp_setup_writeback_mio(void);
int clp_scan_pci_devices(void); int clp_scan_pci_devices(void);
int clp_rescan_pci_devices(void);
int clp_rescan_pci_devices_simple(u32 *fid); int clp_rescan_pci_devices_simple(u32 *fid);
int clp_add_pci_device(u32, u32, int); int clp_add_pci_device(u32, u32, int);
int clp_enable_fh(struct zpci_dev *, u8); int clp_enable_fh(struct zpci_dev *, u8);

17
arch/s390/pci/pci_clp.c
View File

@ -441,23 +441,6 @@ int clp_scan_pci_devices(void)
return rc; 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 /* Rescan PCI functions and refresh function handles. If fid is non-NULL only
* refresh the handle of the function matching @fid * refresh the handle of the function matching @fid
*/ */

3
arch/s390/pci/pci_event.c
View File

@ -150,7 +150,8 @@ static void __zpci_event_availability(struct zpci_ccdf_avail *ccdf)
} }
break; break;
case 0x0306: /* 0x308 or 0x302 for multiple devices */ case 0x0306: /* 0x308 or 0x302 for multiple devices */
clp_rescan_pci_devices(); zpci_remove_reserved_devices();
clp_scan_pci_devices();
break; break;
case 0x0308: /* Standby -> Reserved */ case 0x0308: /* Standby -> Reserved */
if (!zdev) if (!zdev)