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 06/16] PCI: SPARC: convert pcibios_set_master() to a non-inlined function
    Date
    From: Myron Stowe <mstowe@redhat.com>

    This patch converts SPARC'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 SPARC'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/sparc/include/asm/pci_32.h | 5 -----
    arch/sparc/include/asm/pci_64.h | 5 -----
    arch/sparc/kernel/pci.c | 5 +++++
    3 files changed, 5 insertions(+), 10 deletions(-)

    diff --git a/arch/sparc/include/asm/pci_32.h b/arch/sparc/include/asm/pci_32.h
    index 02939ab..6de7f7b 100644
    --- a/arch/sparc/include/asm/pci_32.h
    +++ b/arch/sparc/include/asm/pci_32.h
    @@ -16,11 +16,6 @@

    #define PCI_IRQ_NONE 0xffffffff

    -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/sparc/include/asm/pci_64.h b/arch/sparc/include/asm/pci_64.h
    index 2614d96..755a4bb 100644
    --- a/arch/sparc/include/asm/pci_64.h
    +++ b/arch/sparc/include/asm/pci_64.h
    @@ -16,11 +16,6 @@

    #define PCI_IRQ_NONE 0xffffffff

    -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/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c
    index 1e94f94..269c011 100644
    --- a/arch/sparc/kernel/pci.c
    +++ b/arch/sparc/kernel/pci.c
    @@ -1082,6 +1082,11 @@ void pci_resource_to_user(const struct pci_dev *pdev, int bar,
    *end = rp->end - offset;
    }

    +void pcibios_set_master(struct pci_dev *dev)
    +{
    + /* No special bus mastering setup handling */
    +}
    +
    static int __init pcibios_init(void)
    {
    pci_dfl_cache_line_size = 64 >> 2;


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