lkml.org 
[lkml]   [2015]   [Jan]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 15/28] PCI/powerpc: Rename pcibios_root_bridge_prepare() for better readability
    Date
    Pcibios_root_bridge_prepare() in powerpc is used
    to set root bus speed. So rename it to
    pcibios_set_root_bus_speed() for better readability.

    Signed-off-by: Yijing Wang <wangyijing@huawei.com>
    ---
    arch/powerpc/include/asm/machdep.h | 2 +-
    arch/powerpc/kernel/pci-common.c | 4 ++--
    arch/powerpc/platforms/pseries/pci.c | 2 +-
    arch/powerpc/platforms/pseries/pseries.h | 2 +-
    arch/powerpc/platforms/pseries/setup.c | 2 +-
    5 files changed, 6 insertions(+), 6 deletions(-)

    diff --git a/arch/powerpc/include/asm/machdep.h b/arch/powerpc/include/asm/machdep.h
    index c8175a3..8e7f2a8 100644
    --- a/arch/powerpc/include/asm/machdep.h
    +++ b/arch/powerpc/include/asm/machdep.h
    @@ -129,7 +129,7 @@ struct machdep_calls {
    void (*pcibios_fixup)(void);
    int (*pci_probe_mode)(struct pci_bus *);
    void (*pci_irq_fixup)(struct pci_dev *dev);
    - int (*pcibios_root_bridge_prepare)(struct pci_host_bridge
    + int (*pcibios_set_root_bus_speed)(struct pci_host_bridge
    *bridge);

    /* To setup PHBs when using automatic OF platform driver for PCI */
    diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c
    index 927c3dd..2cf941e 100644
    --- a/arch/powerpc/kernel/pci-common.c
    +++ b/arch/powerpc/kernel/pci-common.c
    @@ -769,8 +769,8 @@ int pci_proc_domain(struct pci_bus *bus)

    int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge)
    {
    - if (ppc_md.pcibios_root_bridge_prepare)
    - return ppc_md.pcibios_root_bridge_prepare(bridge);
    + if (ppc_md.pcibios_set_root_bus_speed)
    + return ppc_md.pcibios_set_root_bus_speed(bridge);

    return 0;
    }
    diff --git a/arch/powerpc/platforms/pseries/pci.c b/arch/powerpc/platforms/pseries/pci.c
    index fe16a50..af685d6 100644
    --- a/arch/powerpc/platforms/pseries/pci.c
    +++ b/arch/powerpc/platforms/pseries/pci.c
    @@ -110,7 +110,7 @@ static void fixup_winbond_82c105(struct pci_dev* dev)
    DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_WINBOND, PCI_DEVICE_ID_WINBOND_82C105,
    fixup_winbond_82c105);

    -int pseries_root_bridge_prepare(struct pci_host_bridge *bridge)
    +int pseries_set_root_bus_speed(struct pci_host_bridge *bridge)
    {
    struct device_node *dn, *pdn;
    struct pci_bus *bus;
    diff --git a/arch/powerpc/platforms/pseries/pseries.h b/arch/powerpc/platforms/pseries/pseries.h
    index 1796c54..5d0be3a 100644
    --- a/arch/powerpc/platforms/pseries/pseries.h
    +++ b/arch/powerpc/platforms/pseries/pseries.h
    @@ -63,7 +63,7 @@ extern int dlpar_detach_node(struct device_node *);

    /* PCI root bridge prepare function override for pseries */
    struct pci_host_bridge;
    -int pseries_root_bridge_prepare(struct pci_host_bridge *bridge);
    +int pseries_set_root_bus_speed(struct pci_host_bridge *bridge);

    unsigned long pseries_memory_block_size(void);

    diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
    index e445b67..b196c0d 100644
    --- a/arch/powerpc/platforms/pseries/setup.c
    +++ b/arch/powerpc/platforms/pseries/setup.c
    @@ -496,7 +496,7 @@ static void __init pSeries_setup_arch(void)
    ppc_md.enable_pmcs = power4_enable_pmcs;
    }

    - ppc_md.pcibios_root_bridge_prepare = pseries_root_bridge_prepare;
    + ppc_md.pcibios_set_root_bus_speed = pseries_set_root_bus_speed;

    if (firmware_has_feature(FW_FEATURE_SET_MODE)) {
    long rc;
    --
    1.7.1


    \
     
     \ /
      Last update: 2015-01-16 05:01    [W:5.033 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site