UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

powerpc/fsl_uli1575: Simplify uli_exclude_device() usage 

Function uli_exclude_device() is called only from mpc86xx_exclude_device()
and mpc85xx_exclude_device() functions. Both those functions are same, so
merge its logic directly into the uli_exclude_device() function.

Signed-off-by: Pali Rohár <pali@kernel.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/20230409000812.18904-4-pali@kernel.org
This commit is contained in:
Pali Rohár 2023-04-09 02:08:07 +02:00 committed by Michael Ellerman
parent 485536b9f2
commit aa9f3d2d61
3 changed files with 5 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
arch/powerpc/platforms/85xx/mpc85xx_ds.c
View File

@ -107,17 +107,6 @@ void __init mpc85xx_ds_pic_init(void)
#endif /* CONFIG_PPC_I8259 */ #endif /* CONFIG_PPC_I8259 */
} }
#ifdef CONFIG_PCI
static int mpc85xx_exclude_device(struct pci_controller *hose,
u_char bus, u_char devfn)
{
if (hose->dn == fsl_pci_primary)
return uli_exclude_device(hose, bus, devfn);
return PCIBIOS_SUCCESSFUL;
}
#endif /* CONFIG_PCI */
static void __init mpc85xx_ds_uli_init(void) static void __init mpc85xx_ds_uli_init(void)
{ {
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
@ -132,7 +121,7 @@ static void __init mpc85xx_ds_uli_init(void)
node = pci_with_uli; node = pci_with_uli;
if (pci_with_uli == fsl_pci_primary) { if (pci_with_uli == fsl_pci_primary) {
ppc_md.pci_exclude_device = mpc85xx_exclude_device; ppc_md.pci_exclude_device = uli_exclude_device;
break; break;
} }
} }

13
arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
View File

@ -39,17 +39,6 @@
#define DBG(fmt...) do { } while(0) #define DBG(fmt...) do { } while(0)
#endif #endif
#ifdef CONFIG_PCI
static int mpc86xx_exclude_device(struct pci_controller *hose,
u_char bus, u_char devfn)
{
if (hose->dn == fsl_pci_primary)
return uli_exclude_device(hose, bus, devfn);
return PCIBIOS_SUCCESSFUL;
}
#endif /* CONFIG_PCI */
static void __init static void __init
mpc86xx_hpcn_setup_arch(void) mpc86xx_hpcn_setup_arch(void)
@ -58,7 +47,7 @@ mpc86xx_hpcn_setup_arch(void)
ppc_md.progress("mpc86xx_hpcn_setup_arch()", 0); ppc_md.progress("mpc86xx_hpcn_setup_arch()", 0);
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
ppc_md.pci_exclude_device = mpc86xx_exclude_device; ppc_md.pci_exclude_device = uli_exclude_device;
#endif #endif
printk("MPC86xx HPCN board from Freescale Semiconductor\n"); printk("MPC86xx HPCN board from Freescale Semiconductor\n");

4
arch/powerpc/platforms/fsl_uli1575.c
View File

@ -15,6 +15,8 @@
#include <asm/pci-bridge.h> #include <asm/pci-bridge.h>
#include <asm/ppc-pci.h> #include <asm/ppc-pci.h>
#include <sysdev/fsl_pci.h>
#define ULI_PIRQA 0x08 #define ULI_PIRQA 0x08
#define ULI_PIRQB 0x09 #define ULI_PIRQB 0x09
#define ULI_PIRQC 0x0a #define ULI_PIRQC 0x0a
@ -344,7 +346,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AL, 0x5288, hpcd_final_uli5288);
int uli_exclude_device(struct pci_controller *hose, u_char bus, u_char devfn) int uli_exclude_device(struct pci_controller *hose, u_char bus, u_char devfn)
{ {
if (bus == (hose->first_busno + 2)) { if (hose->dn == fsl_pci_primary && bus == (hose->first_busno + 2)) {
/* exclude Modem controller */ /* exclude Modem controller */
if ((PCI_SLOT(devfn) == 29) && (PCI_FUNC(devfn) == 1)) if ((PCI_SLOT(devfn) == 29) && (PCI_FUNC(devfn) == 1))
return PCIBIOS_DEVICE_NOT_FOUND; return PCIBIOS_DEVICE_NOT_FOUND;