lkml.org 
[lkml]   [2011]   [Oct]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH -v2 04/16] PCI: MicroBlaze: convert pcibios_set_master() to a non-inlined function
    Date
    From: Myron Stowe <mstowe@redhat.com>

    This patch converts MicroBlaze's architecture-specific
    'pcibios_set_master()' routine to a non-inlined function. This will
    allow follow on patches to create a generic 'pcibios_set_master()'
    function using the '__weak' attribute which can be used by all
    architectures as a default which, if necessary, can then be over-
    ridden by architecture-specific code.

    Converting 'pci_bios_set_master()' to a non-inlined function will
    allow MicroBlaze's 'pcibios_set_master()' implementation to remain
    architecture-specific after the generic version is introduced and thus,
    not change current behavior.

    No functional change.

    Signed-off-by: Myron Stowe <myron.stowe@redhat.com>
    ---

    arch/microblaze/include/asm/pci.h | 5 -----
    arch/microblaze/pci/pci-common.c | 5 +++++
    2 files changed, 5 insertions(+), 5 deletions(-)

    diff --git a/arch/microblaze/include/asm/pci.h b/arch/microblaze/include/asm/pci.h
    index 1dd9d6b..0331376 100644
    --- a/arch/microblaze/include/asm/pci.h
    +++ b/arch/microblaze/include/asm/pci.h
    @@ -42,11 +42,6 @@ struct pci_dev;
    */
    #define pcibios_assign_all_busses() 0

    -static inline void pcibios_set_master(struct pci_dev *dev)
    -{
    - /* No special bus mastering setup handling */
    -}
    -
    static inline void pcibios_penalize_isa_irq(int irq, int active)
    {
    /* We don't do dynamic PCI IRQ allocation */
    diff --git a/arch/microblaze/pci/pci-common.c b/arch/microblaze/pci/pci-common.c
    index 4cfae20..1a500c5 100644
    --- a/arch/microblaze/pci/pci-common.c
    +++ b/arch/microblaze/pci/pci-common.c
    @@ -189,6 +189,11 @@ int pcibios_add_platform_entries(struct pci_dev *pdev)
    return device_create_file(&pdev->dev, &dev_attr_devspec);
    }

    +void pcibios_set_master(struct pci_dev *dev)
    +{
    + /* No special bus mastering setup handling */
    +}
    +
    char __devinit *pcibios_setup(char *str)
    {
    return str;


    \
     
     \ /
      Last update: 2011-10-28 23:51    [W:0.023 / U:61.012 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site